rapc-commit Mailing List for Road Advertisement Panel Control
Brought to you by:
maher_karim,
sdteffen
Menu
▾
▴
rapc-commit — RAPC commit mailing list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
(23) |
Dec
(28) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(14) |
Feb
(38) |
Mar
(6) |
Apr
|
May
(2) |
Jun
(2) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mah...@us...> - 2007-07-23 10:46:17
|
Revision: 63
http://svn.sourceforge.net/rapc/?rev=63&view=rev
Author: maher_karim
Date: 2007-07-23 03:46:10 -0700 (Mon, 23 Jul 2007)
Log Message:
-----------
2007-07-23 Maher Abdel karim <mah...@do...>
* locale/LC_MESSAGES/ar:
* locale/LC_MESSAGES/en:update translation
* map.php
* include/dcmmaputil.php:add more layers to be displayed
in TOC
* etc/fonts.txt:
* etc/symbols.sym:add more symbols.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/etc/fonts.txt
trunk/rapc/etc/symbols.sym
trunk/rapc/include/dcmmaputil.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/map.php
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-06-11 11:16:22 UTC (rev 62)
+++ trunk/rapc/changelog 2007-07-23 10:46:10 UTC (rev 63)
@@ -1,3 +1,14 @@
+2007-07-23 Maher Abdel karim <mah...@do...>
+
+ * locale/LC_MESSAGES/ar:
+ * locale/LC_MESSAGES/en:update translation
+ * map.php
+ * include/dcmmaputil.php:add more layers to be displayed
+ in TOC
+ * etc/fonts.txt:
+ * etc/symbols.sym:add more symbols.
+
+
2007-06-11 Maher Abdel karim <mah...@do...>
* locale/LC_MESSAGES/ar:
Modified: trunk/rapc/etc/fonts.txt
===================================================================
--- trunk/rapc/etc/fonts.txt 2007-06-11 11:16:22 UTC (rev 62)
+++ trunk/rapc/etc/fonts.txt 2007-07-23 10:46:10 UTC (rev 63)
@@ -2,3 +2,10 @@
esri_0 c:/windows/fonts/esri_0.ttf
marvosym c:/windows/fonts/marvosym.ttf
civil c:/windows/fonts/civil.ttf
+IGL c:/windows/fonts/esri_220.ttf
+signs c:/windows/fonts/esri_48.ttf
+arcpad c:/windows/fonts/esri_30s.ttf
+trans c:/windows/fonts/esri_9.ttf
+signs2 c:/windows/fonts/esri_49.ttf
+nima1 c:/windows/fonts/esri_17.ttf
+nima2 c:/windows/fonts/esri_16.ttf
Modified: trunk/rapc/etc/symbols.sym
===================================================================
--- trunk/rapc/etc/symbols.sym 2007-06-11 11:16:22 UTC (rev 62)
+++ trunk/rapc/etc/symbols.sym 2007-07-23 10:46:10 UTC (rev 63)
@@ -41,5 +41,51 @@
NAME 'aoihatch'
TYPE HATCH
END
+symbol
+ name "dots"
+ type ELLIPSE
+ filled true
+ points
+ 1 1
+ end
+end
+symbol
+name "boundary"
+type ELLIPSE
+filled true
+points
+1 1
+end
+style
+10 10
+end
+end
+symbol
+name "bridge"
+type truetype
+font nima2
+CHARACTER "5"
+antialias true
+gap 10
+end
+
+symbol
+name "sign"
+type truetype
+font signs
+CHARACTER "L"
+antialias true
+gap 10
+end
+
+symbol
+name "sign2"
+type truetype
+font signs
+CHARACTER " "
+antialias true
+gap 10
+end
+
Modified: trunk/rapc/include/dcmmaputil.php
===================================================================
--- trunk/rapc/include/dcmmaputil.php 2007-06-11 11:16:22 UTC (rev 62)
+++ trunk/rapc/include/dcmmaputil.php 2007-07-23 10:46:10 UTC (rev 63)
@@ -51,7 +51,8 @@
*/
function showLayers($gpoMap, $HTTP_FORM_VARS) {
if (sizeof($HTTP_FORM_VARS) >= 2) {
- $arrLayers = array("Msroads","Villages","Adminsub");
+ $arrLayers = array("Road_ln","Road_nd","Transport","road_thr","maint_station","bridge",
+ "traffic_light","humps","Panel");
foreach($arrLayers as $strLayer) {
$poLayer = $gpoMap->getlayerbyname($strLayer);
if(array_key_exists($strLayer, $HTTP_FORM_VARS) &&
@@ -154,11 +155,11 @@
* Editing tool for delivery points.
//here
-
-
-
-
-
+
+
+
+
+
/**
* Table to display the results from a queried layer
*/
@@ -314,15 +315,15 @@
if($this->strAction == "movePoint") {
$strImage = "icon_landmark.png";
}
-
+
$strHtml = "<img src=\"images/$strImage\" width=\"24\" ".
"height=\"24\" border=\"0\" alt=\""._('Panel2')."\" /></td><td>";
$strHtml = $strHtml.parent::toHtml()._('Panel')." ";
-
+
if($this->intSelectedID != NULL) {
//print_r($this->$strPointID."m");
if($this->boolPointEditor) {
-
+
if($this->strAction == "movePoint") {
// print_r('maher222222222222222222222222222222');
if($this->intX != NULL) {
@@ -363,7 +364,7 @@
"&id=".$this->intSelectedID."\">".
_("Move")."</a> ]";
}
-
+
} else {
//print_r('Hello');
$strHtml = $strHtml."<a href=\"panelpage.php?action=view&PHPSESSID=".
Modified: trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-06-11 11:16:22 UTC (rev 62)
+++ trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-07-23 10:46:10 UTC (rev 63)
@@ -2,8 +2,8 @@
msgstr ""
"Project-Id-Version: mpwh\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-06-11 11:38+0200\n"
-"Last-Translator: Maher_Karim <Mah...@do...>\n"
+"PO-Revision-Date: 2007-07-23 13:53+0300\n"
+"Last-Translator: \n"
"Language-Team: dc <mah...@do...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -110,7 +110,7 @@
msgstr "اظهار على الخريطة"
#: ../../../address_confirmation.php:105
-#: ../../../map.php:731
+#: ../../../map.php:831
msgid "Print map"
msgstr "طباعة الخريطة"
@@ -255,6 +255,8 @@
msgstr "رقم الوصل المالي"
#: ../../../detailed_panelinstallation_report.php:110
+#: ../../../illegal_panelinstallation_report.php:130
+#: ../../../illegal_panelinstallation_report.php:131
#: ../../../panelinstallation_report.php:129
#: ../../../panelinstallation_report.php:130
#: ../../../print.php:65
@@ -350,6 +352,20 @@
msgid "Illegal panel list from:"
msgstr "قائمة اللوحات المخالفة من:"
+#: ../../../illegal_panelinstallation_report.php:128
+#: ../../../panelinstallation_report.php:127
+msgid "Responsible Engineer"
+msgstr "المهندس المسؤول:"
+
+#: ../../../illegal_panelinstallation_report.php:130
+#: ../../../panelinstallation_report.php:129
+msgid "Public Works Office for:"
+msgstr "مكتب اشغال محافظة:"
+
+#: ../../../illegal_panelinstallation_report.php:130
+msgid "district"
+msgstr "المحافظة"
+
#: ../../../index.php:26
msgid "Ministry of Public works and Housing"
msgstr "وزارة الاشغال العامة و الاسكان"
@@ -379,8 +395,7 @@
msgstr "اضغط على الرابط للمشاهدة على الخريطة"
#: ../../../index.php:58
-#: ../../../mainpage.php:239
-#: ../../../panelpage.php:241
+#: ../../../panelpage.php:275
msgid "New Data Entry"
msgstr "ادخال معلومات لوحة جديدة"
@@ -506,182 +521,196 @@
msgid "Login"
msgstr "دخول"
-#: ../../../mainpage.php:38
-msgid "Accident Black Spot"
-msgstr ""
-
-#: ../../../mainpage.php:91
-#: ../../../panelpage.php:91
-msgid "FATAL ERROR: No id provided in request."
-msgstr ""
-
-#: ../../../mainpage.php:148
-#: ../../../panelpage.php:150
-#: ../../../panelpage.php:231
-msgid "Panel #"
-msgstr "رقم اللوحة"
-
-#: ../../../mainpage.php:151
-#: ../../../mainpage.php:237
-#: ../../../panelpage.php:153
-#: ../../../panelpage.php:239
-msgid "View on Map"
-msgstr "اظهار على الخريطة"
-
-#: ../../../mainpage.php:158
-#: ../../../panelpage.php:160
-msgid "Please refer to RIS information to complete road information."
-msgstr "يرجى الرجوع الى نظام RIS لاستكمال معلومات الطريق و التأكد منها."
-
-#: ../../../mainpage.php:217
-#: ../../../panelpage.php:219
-msgid "Failed to save record(s)."
-msgstr "لم يتم حفظ الشجلات."
-
-#: ../../../mainpage.php:226
-#: ../../../panelpage.php:228
-msgid "Image is loaded"
-msgstr "تم تحميل الصورة"
-
-#: ../../../mainpage.php:233
-#: ../../../panelpage.php:235
-msgid "Record(s) successfully saved."
-msgstr "تمت عملية حفظ السجلات بنجاح."
-
-#: ../../../map.php:214
+#: ../../../map.php:215
#, php-format
msgid "Moving Point %s."
msgstr "تحريك النقطة %s."
-#: ../../../map.php:242
+#: ../../../map.php:243
msgid "Deleted Point."
msgstr "حذف النقطة."
-#: ../../../map.php:242
+#: ../../../map.php:243
msgid " "
msgstr ""
-#: ../../../map.php:242
+#: ../../../map.php:243
msgid "PointID:"
msgstr "رقم النقطة:"
-#: ../../../map.php:242
+#: ../../../map.php:243
msgid "id"
msgstr "رقم النقطة"
-#: ../../../map.php:282
+#: ../../../map.php:270
msgid "NO geocode value returned"
msgstr ""
-#: ../../../map.php:302
+#: ../../../map.php:290
msgid "Moved Panel#."
msgstr "تم تحريك النقطة #"
-#: ../../../map.php:520
+#: ../../../map.php:508
msgid "Legend"
msgstr "المفتاح"
-#: ../../../map.php:542
-msgid "Display the Routes"
+#: ../../../map.php:530
+msgid "Display the Road lines"
msgstr "اظهار الطرق"
-#: ../../../map.php:543
-msgid "Route"
-msgstr "الطريق"
+#: ../../../map.php:531
+msgid "Road Line"
+msgstr "الطرق"
-#: ../../../map.php:557
-msgid "Display the Villages"
-msgstr "اظهار القرى"
+#: ../../../map.php:546
+msgid "Display the Road through lines"
+msgstr "اظهار الطرق النافذه"
-#: ../../../map.php:558
-msgid "Villages"
-msgstr "القرى"
+#: ../../../map.php:547
+msgid "Road through Line"
+msgstr "الطرق النافذه"
-#: ../../../map.php:572
+#: ../../../map.php:561
+msgid "Display the maintenance station locations"
+msgstr "اظهار محطات الصيانة"
+
+#: ../../../map.php:562
+msgid "Maintenance station locations"
+msgstr "محطات الصيانة"
+
+#: ../../../map.php:577
+msgid "Display the bridge locations"
+msgstr "اظهار مواقع الجسور"
+
+#: ../../../map.php:578
+msgid "Bridge locations"
+msgstr "الجسور"
+
+#: ../../../map.php:593
+msgid "Display the Panel locations"
+msgstr "اظهار اللوحات الاعلانية"
+
+#: ../../../map.php:594
+msgid "Panel locations"
+msgstr "مواقع اللوحات الاعلانية"
+
+#: ../../../map.php:609
+msgid "Display the hump locations"
+msgstr "اظهار مواقع المطبات"
+
+#: ../../../map.php:610
+msgid "hump locations"
+msgstr "المطبات"
+
+#: ../../../map.php:626
+msgid "Display the traffic lights locations"
+msgstr "اظهار مواقع الاشارات الضوئية"
+
+#: ../../../map.php:627
+msgid "Traffic light locations"
+msgstr "الاشارات الضوئية"
+
+#: ../../../map.php:642
+msgid "Display the Road node"
+msgstr "اظهار التقاطعات"
+
+#: ../../../map.php:643
+msgid "Road node"
+msgstr "التقاطعات"
+
+#: ../../../map.php:657
+msgid "Display the Transport"
+msgstr "اظهار خطوط النقل"
+
+#: ../../../map.php:658
+msgid "Transport roads"
+msgstr "الخطوط الناقلة"
+
+#: ../../../map.php:672
msgid "Display the Administrative boundary"
msgstr "اظهار الحدود الادارية"
-#: ../../../map.php:573
+#: ../../../map.php:673
msgid "Administrative boundary"
msgstr "الحدود الادارية"
-#: ../../../map.php:583
+#: ../../../map.php:683
msgid "Landmark"
msgstr "المعالم"
-#: ../../../map.php:591
+#: ../../../map.php:691
msgid "Refresh the map display"
msgstr "تحديث الخريطة"
-#: ../../../map.php:592
+#: ../../../map.php:692
msgid "Redraw Map"
msgstr "اعادة رسم الخريطة"
-#: ../../../map.php:600
+#: ../../../map.php:700
msgid "Zoom to grid"
msgstr "التكبير الى"
-#: ../../../map.php:618
+#: ../../../map.php:718
msgid "Select the map size from the list."
msgstr "اختيار ابعاد الخريطة من القائمة."
-#: ../../../map.php:619
+#: ../../../map.php:719
msgid "Map Size"
msgstr "حجم الخريطة"
-#: ../../../map.php:645
+#: ../../../map.php:745
msgid "From Point:"
msgstr "من النقطة:"
-#: ../../../map.php:648
+#: ../../../map.php:748
msgid "To Point:"
msgstr "الى النقطة:"
-#: ../../../map.php:651
+#: ../../../map.php:751
msgid "Distance:"
msgstr "المسافة بين النقطتين:"
-#: ../../../map.php:654
+#: ../../../map.php:754
msgid "Find distance"
msgstr "ايجاد المسافة"
-#: ../../../map.php:674
+#: ../../../map.php:774
msgid "Keymap"
msgstr "الخريطة العامة"
-#: ../../../map.php:678
+#: ../../../map.php:778
msgid "Click on the key map to view an area."
msgstr "اضغط على الخريطة العامة للتكبير الى منطقة."
-#: ../../../map.php:689
+#: ../../../map.php:789
msgid "Zoom in further to display more detailed map information."
msgstr "التكبير اكثر لاظهار تفاصيل اكثر."
-#: ../../../map.php:691
+#: ../../../map.php:791
msgid "Zoom In"
msgstr "تكبير"
-#: ../../../map.php:699
+#: ../../../map.php:799
msgid "Zoom out to display a larger area of the map."
msgstr "التصغير لاظهار تفاصيل اقل."
-#: ../../../map.php:701
+#: ../../../map.php:801
msgid "Zoom Out"
msgstr "تصغير"
-#: ../../../map.php:709
+#: ../../../map.php:809
msgid "Move the map view without zooming in or out."
msgstr "التنقل عبر الخريطة بدون تكبير او تصغير."
-#: ../../../map.php:711
+#: ../../../map.php:811
msgid "Pan"
msgstr "تحريك"
-#: ../../../map.php:719
+#: ../../../map.php:819
msgid "Display information about elements in the map."
msgstr "اظهار معلومات حول عناصر الخريطة."
-#: ../../../map.php:721
+#: ../../../map.php:821
msgid "Identify"
msgstr "تعريف"
@@ -694,18 +723,40 @@
msgid "Unkown"
msgstr "غير محدد"
-#: ../../../panelinstallation_report.php:127
-msgid "Responsible Engineer"
-msgstr "المهندس المسؤول:"
-
-#: ../../../panelinstallation_report.php:129
-msgid "Public Works Office for:"
-msgstr "مكتب اشغال محافظة:"
-
#: ../../../panelpage.php:38
msgid "Road Advertisment Panel Control"
msgstr "برنامج التحكم باللوحات الاعلانية على الطرق"
+#: ../../../panelpage.php:91
+msgid "FATAL ERROR: No id provided in request."
+msgstr ""
+
+#: ../../../panelpage.php:150
+#: ../../../panelpage.php:265
+msgid "Panel #"
+msgstr "رقم اللوحة"
+
+#: ../../../panelpage.php:153
+#: ../../../panelpage.php:273
+msgid "View on Map"
+msgstr "اظهار على الخريطة"
+
+#: ../../../panelpage.php:160
+msgid "Please refer to RIS information to complete road information."
+msgstr "يرجى الرجوع الى نظام RIS لاستكمال معلومات الطريق و التأكد منها."
+
+#: ../../../panelpage.php:253
+msgid "Failed to save record(s)."
+msgstr "لم يتم حفظ الشجلات."
+
+#: ../../../panelpage.php:262
+msgid "Image is loaded"
+msgstr "تم تحميل الصورة"
+
+#: ../../../panelpage.php:269
+msgid "Record(s) successfully saved."
+msgstr "تمت عملية حفظ السجلات بنجاح."
+
#: ../../../paneltypes_report.php:36
msgid "Panel types Report"
msgstr "تقرير انواع اللوحات الاعلانية."
@@ -1292,35 +1343,31 @@
msgid "Nothing was found at this location."
msgstr "لم يتم ايجاد شيئ في هذا المكان"
-#: ../../../include/dcmmaputil.php:319
+#: ../../../include/dcmmaputil.php:320
msgid "Panel2"
msgstr ""
-#: ../../../include/dcmmaputil.php:320
+#: ../../../include/dcmmaputil.php:321
msgid "Panel"
msgstr "اللوحة"
-#: ../../../include/dcmmaputil.php:338
+#: ../../../include/dcmmaputil.php:339
msgid "Accept Move"
msgstr "قبول التحريك"
-#: ../../../include/dcmmaputil.php:347
+#: ../../../include/dcmmaputil.php:348
msgid "Cancel Move"
msgstr "الغاء التحريك"
-#: ../../../include/dcmmaputil.php:355
+#: ../../../include/dcmmaputil.php:356
msgid "[Edit"
msgstr "[تحرير"
-#: ../../../include/dcmmaputil.php:364
+#: ../../../include/dcmmaputil.php:365
msgid "Move"
msgstr "تحريك"
-#: ../../../include/dcmmaputil.php:373
-msgid "Delete"
-msgstr "حذف"
-
-#: ../../../include/dcmmaputil.php:379
+#: ../../../include/dcmmaputil.php:371
msgid "[View]"
msgstr "[اظ\xD9\x87ار على الخريطة]"
@@ -2166,7 +2213,7 @@
msgid "Description"
msgstr "الوصف"
-#: ../../../plugin/imageidentifyplugin.php:163
+#: ../../../plugin/imageidentifyplugin.php:166
msgid "A plug-in to display images of features selected by the identify tool."
msgstr ""
Modified: trunk/rapc/map.php
===================================================================
--- trunk/rapc/map.php 2007-06-11 11:16:22 UTC (rev 62)
+++ trunk/rapc/map.php 2007-07-23 10:46:10 UTC (rev 63)
@@ -167,10 +167,10 @@
case "search":
// $objLayer = $gpoMap->getlayerbyname($_POST[layer][0]);
- $objLayer = $gpoMap->getlayerbyname('Msroads');
+ $objLayer = $gpoMap->getlayerbyname('Road_ln');
// print_r(str_replace(" ","+",$_REQUEST['searchvalue']));
- if ($objLayer->queryByAttributes('ROUTENAME',str_replace(" ","+",$_REQUEST['searchvalue']),MS_SINGLE) ==MS_SUCCESS) {
+ if ($objLayer->queryByAttributes('ROUTE_NAME',str_replace(" ","+",$_REQUEST['searchvalue']),MS_SINGLE) ==MS_SUCCESS) {
$ResultCount=$objLayer->getNumResults();
@@ -518,8 +518,8 @@
<tr>
<td>
<input type="checkbox"
- name="Msroads" value="Y"<?php
- if(GMapGetStatus("Msroads") == 1) {
+ name="Road_ln" value="Y"<?php
+ if(GMapGetStatus("Road_ln") == 1) {
echo(" checked=\"CHECKED\"");
}
?> />
@@ -527,14 +527,111 @@
<td><img src="images/water_network.png"
width="20" height="15"></td>
<td>
- <a name="#routes" title="<?= _("Display the Routes")?>">
- <?= _("Route") ?></a></td>
+ <a name="#routes" title="<?= _("Display the Road lines")?>">
+ <?= _("Road Line") ?></a></td>
</tr>
+
+ <tr>
+ <td>
+ <input type="checkbox"
+ name="road_thr" value="Y"<?php
+ if(GMapGetStatus("road_thr") == 1) {
+ echo(" checked=\"CHECKED\"");
+ }
+ ?> />
+ </td>
+ <td><img src="images/water_network.png"
+ width="20" height="15"></td>
+ <td>
+ <a name="#routes" title="<?= _("Display the Road through lines")?>">
+ <?= _("Road through Line") ?></a></td>
+ </tr>
+ <tr>
+ <td>
+ <input type="checkbox"
+ name="maint_station" value="Y"<?php
+ if(GMapGetStatus("maint_station") == 1) {
+ echo(" checked=\"CHECKED\"");
+ }
+ ?> />
+ </td>
+ <td><img src="images/water_network.png"
+ width="20" height="15"></td>
+ <td>
+ <a name="#routes" title="<?= _("Display the maintenance station locations")?>">
+ <?= _("Maintenance station locations") ?></a></td>
+ </tr>
+
+<tr>
+<td>
+<input type="checkbox"
+name="bridge" value="Y"<?php
+if(GMapGetStatus("bridge") == 1) {
+echo(" checked=\"CHECKED\"");
+}
+?> />
+</td>
+<td><img src="images/water_network.png"
+width="20" height="15"></td>
+<td>
+<a name="#routes" title="<?= _("Display the bridge locations")?>">
+<?= _("Bridge locations") ?></a></td>
+</tr>
+
+<tr>
+<td>
+<input type="checkbox"
+name="Panel" value="Y"<?php
+if(GMapGetStatus("Panel") == 1) {
+echo(" checked=\"CHECKED\"");
+}
+?> />
+</td>
+<td><img src="images/water_network.png"
+width="20" height="15"></td>
+<td>
+<a name="#routes" title="<?= _("Display the Panel locations")?>">
+<?= _("Panel locations") ?></a></td>
+</tr>
+
+<tr>
+<td>
+<input type="checkbox"
+name="humps" value="Y"<?php
+if(GMapGetStatus("humps") == 1) {
+echo(" checked=\"CHECKED\"");
+}
+?> />
+</td>
+<td><img src="images/water_network.png"
+width="20" height="15"></td>
+<td>
+<a name="#routes" title="<?= _("Display the hump locations")?>">
+<?= _("hump locations") ?></a></td>
+</tr>
+
+
+<tr>
+<td>
+<input type="checkbox"
+name="traffic_light" value="Y"<?php
+if(GMapGetStatus("traffic_light") == 1) {
+echo(" checked=\"CHECKED\"");
+}
+?> />
+</td>
+<td><img src="images/water_network.png"
+width="20" height="15"></td>
+<td>
+<a name="#routes" title="<?= _("Display the traffic lights locations")?>">
+<?= _("Traffic light locations") ?></a></td>
+</tr>
+
<tr>
<td>
<input type="checkbox"
- name="Villages" value="Y"<?php
- if(GMapGetStatus("Villages") == 1) {
+ name="Road_nd" value="Y"<?php
+ if(GMapGetStatus("Road_nd") == 1) {
echo(" checked=\"CHECKED\"");
}
?> />
@@ -542,14 +639,29 @@
<td><img src="images/water_network.png"
width="20" height="15"></td>
<td>
- <a name="#routes" title="<?= _("Display the Villages")?>">
- <?= _("Villages") ?></a></td>
- </tr>
+ <a name="#routes" title="<?= _("Display the Road node")?>">
+ <?= _("Road node") ?></a></td>
+ </tr>
+ <tr>
+ <td>
+ <input type="checkbox"
+ name="Transport" value="Y"<?php
+ if(GMapGetStatus("Transport") == 1) {
+ echo(" checked=\"CHECKED\"");
+ }
+ ?> />
+ </td>
+ <td><img src="images/water_network.png"
+ width="20" height="15"></td>
+ <td>
+ <a name="#routes" title="<?= _("Display the Transport")?>">
+ <?= _("Transport roads") ?></a></td>
+ </tr>
<tr>
<td>
<input type="checkbox"
- name="Adminsub" value="Y"<?php
- if(GMapGetStatus("Adminsub") == 1) {
+ name="Transport" value="Y"<?php
+ if(GMapGetStatus("Transport") == 1) {
echo(" checked=\"CHECKED\"");
}
?> />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-07-23 10:46:12
|
Revision: 63
http://svn.sourceforge.net/rapc/?rev=63&view=rev
Author: maher_karim
Date: 2007-07-23 03:46:10 -0700 (Mon, 23 Jul 2007)
Log Message:
-----------
2007-07-23 Maher Abdel karim <mah...@do...>
* locale/LC_MESSAGES/ar:
* locale/LC_MESSAGES/en:update translation
* map.php
* include/dcmmaputil.php:add more layers to be displayed
in TOC
* etc/fonts.txt:
* etc/symbols.sym:add more symbols.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/etc/fonts.txt
trunk/rapc/etc/symbols.sym
trunk/rapc/include/dcmmaputil.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/map.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-06-11 11:16:28
|
Revision: 62
http://svn.sourceforge.net/rapc/?rev=62&view=rev
Author: maher_karim
Date: 2007-06-11 04:16:22 -0700 (Mon, 11 Jun 2007)
Log Message:
-----------
2007-06-11 Maher Abdel karim <mah...@do...>
* locale/LC_MESSAGES/ar:
* locale/LC_MESSAGES/en:update translation
* doc/user/en/rapc_user_guide.xml:update documentation
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/doc/user/en/rapc_user_guide.xml
trunk/rapc/doc/user/en/toc.hhc
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/locale/en/LC_MESSAGES/rapc.po
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-05-28 11:39:33 UTC (rev 61)
+++ trunk/rapc/changelog 2007-06-11 11:16:22 UTC (rev 62)
@@ -1,3 +1,9 @@
+2007-06-11 Maher Abdel karim <mah...@do...>
+
+ * locale/LC_MESSAGES/ar:
+ * locale/LC_MESSAGES/en:update translation
+ * doc/user/en/rapc_user_guide.xml:update documentation
+
2007-05-28 Maher Abdel karim <mah...@do...>
* panelinstallation_report.php:fixed district value
Modified: trunk/rapc/doc/user/en/rapc_user_guide.xml
===================================================================
--- trunk/rapc/doc/user/en/rapc_user_guide.xml 2007-05-28 11:39:33 UTC (rev 61)
+++ trunk/rapc/doc/user/en/rapc_user_guide.xml 2007-06-11 11:16:22 UTC (rev 62)
@@ -30,7 +30,7 @@
<title>Introduction</title>
<para>This document describes how to use the Road Advertisement Panel Control
- (RAPC) application version 0.0.1.</para>
+ (RAPC) application version 0.5.0.</para>
<para>RAPC is a web-based application that allows to record and analyze
detailed Advertisement Panel information.</para>
@@ -535,7 +535,7 @@
<listitem>
<para>The RAPC version. The version number can be found in the
top line of the application, along with the main menu link.
- Example: RAPC 0.5.0</para>
+ Example: RAPC 0.0.1</para>
</listitem>
<listitem>
Modified: trunk/rapc/doc/user/en/toc.hhc
===================================================================
--- trunk/rapc/doc/user/en/toc.hhc 2007-05-28 11:39:33 UTC (rev 61)
+++ trunk/rapc/doc/user/en/toc.hhc 2007-06-11 11:16:22 UTC (rev 62)
@@ -16,8 +16,8 @@
<param name="Name" value="What's New?">
<param name="Local" value="news.html">
</OBJECT><UL><LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Version 0.0.1">
- <param name="Local" value="news_0_0_1.html">
+ <param name="Name" value="Version 0.5.0">
+ <param name="Local" value="news_0_5_0.html">
</OBJECT></UL></UL><LI> <OBJECT type="text/sitemap">
<param name="Name" value="Requirements">
<param name="Local" value="requirements.html">
Modified: trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-05-28 11:39:33 UTC (rev 61)
+++ trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-06-11 11:16:22 UTC (rev 62)
@@ -2,8 +2,8 @@
msgstr ""
"Project-Id-Version: mpwh\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-03-18 11:22+0200\n"
-"Last-Translator: t <t>\n"
+"PO-Revision-Date: 2007-06-11 11:38+0200\n"
+"Last-Translator: Maher_Karim <Mah...@do...>\n"
"Language-Team: dc <mah...@do...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
Modified: trunk/rapc/locale/en/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/en/LC_MESSAGES/rapc.po 2007-05-28 11:39:33 UTC (rev 61)
+++ trunk/rapc/locale/en/LC_MESSAGES/rapc.po 2007-06-11 11:16:22 UTC (rev 62)
@@ -2,8 +2,8 @@
msgstr ""
"Project-Id-Version: rapc\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2006-11-21 18:42+0200\n"
-"Last-Translator: Steffen Macke <Ste...@do...>\n"
+"PO-Revision-Date: 2007-06-11 11:38+0200\n"
+"Last-Translator: Maher_Karim <Mah...@do...>\n"
"Language-Team: DC <mah...@do...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-06-11 11:16:27
|
Revision: 62
http://svn.sourceforge.net/rapc/?rev=62&view=rev
Author: maher_karim
Date: 2007-06-11 04:16:22 -0700 (Mon, 11 Jun 2007)
Log Message:
-----------
2007-06-11 Maher Abdel karim <mah...@do...>
* locale/LC_MESSAGES/ar:
* locale/LC_MESSAGES/en:update translation
* doc/user/en/rapc_user_guide.xml:update documentation
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/doc/user/en/rapc_user_guide.xml
trunk/rapc/doc/user/en/toc.hhc
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/locale/en/LC_MESSAGES/rapc.po
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-05-28 11:39:39
|
Revision: 61
http://svn.sourceforge.net/rapc/?rev=61&view=rev
Author: maher_karim
Date: 2007-05-28 04:39:33 -0700 (Mon, 28 May 2007)
Log Message:
-----------
2007-05-28 Maher Abdel karim <mah...@do...>
* panelinstallation_report.php:fixed district value
handling
* panelpage.php:assign default values for edit based
on passed id.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-03-22 07:07:21 UTC (rev 60)
+++ trunk/rapc/changelog 2007-05-28 11:39:33 UTC (rev 61)
@@ -1,3 +1,10 @@
+2007-05-28 Maher Abdel karim <mah...@do...>
+
+ * panelinstallation_report.php:fixed district value
+ handling
+ * panelpage.php:assign default values for edit based
+ on passed id.
+
2007-03-22 Maher Abdel karim <mah...@do...>
* conf/rapc_ar.map
Modified: trunk/rapc/panelinstallation_report.php
===================================================================
--- trunk/rapc/panelinstallation_report.php 2007-03-22 07:07:21 UTC (rev 60)
+++ trunk/rapc/panelinstallation_report.php 2007-05-28 11:39:33 UTC (rev 61)
@@ -61,29 +61,29 @@
if (strtolower($_SESSION['UserName'])!='admin'){
$strWhere =" where panelinformation.username='".$_SESSION['UserName']."'";
} else {
- $strWhere =" where panelinformation.username<>''";
+ $strWhere =" where panelinformation.username<>''";
}
//print_r($_POST['district']);
-if ($_POST['district']!=''){
+if ($_POST['district']!='0'){
$strWhere = $strWhere." and panelinformation.district='".$Queryform->exportvalue('district')."'";
-
+
} else {
$strWhere = $strWhere." and panelinformation.district<>''";
}
if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['m']!=0)&&($_POST['fromdate']['Y']!=0)) {
$strWhere = $strWhere . " and date >=to_date('".$_POST['fromdate']['Y']."-".
$_POST['fromdate']['m']."-".$_POST['fromdate']['d']."','YYYY-MM-dd')";
-
-
+
+
} elseif (($_POST['todate']['d']!=0)&&($_POST['todate']['m']!=0)&&($_POST['todate']['Y']!=0)){
$strWhere = $strWhere . " and date <= to_date('".$_POST['todate']['Y']."-".
$_POST['todate']['m']."-".$_POST['todate']['d']."','YYYY-MM-dd')";
}
-
+
/*$strQuery = "select panel.companyname,panel.panelsubject,
routetype.description as routetype,
panel.routename,
@@ -92,13 +92,13 @@
panel.totalfees,panel.usefees,
panel.receiptno,panel.receiptdate,panel.insurancereceiptno,
-panel.insurancereceiptdate,panel.notes
- from panel left outer join typedimensionfees on
- (panel.routetype=typedimensionfees.routetype and
+panel.insurancereceiptdate,panel.notes
+ from panel left outer join typedimensionfees on
+ (panel.routetype=typedimensionfees.routetype and
panel.paneldimension=typedimensionfees.paneldimension)
left outer join insurance on (insurance.codedvalue=typedimensionfees.insurance)
left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension)
-left outer join routetype on (routetype.codedvalue=panel.routetype) left outer
+left outer join routetype on (routetype.codedvalue=panel.routetype) left outer
join facecount on (facecount.codedvalue=panel.facecount) ".$strWhere;
*/
$strQuery="select id,x,y,companyname,registerno,panelsubject,routetype,routename,
@@ -109,7 +109,7 @@
routetype,dimension,facecount,insurance,usefees,receiptno,receiptdate,
insurancereceiptdate,boolrow,registerno,insurancereceiptno,date,id,x,y";
//print_r($strQuery);
-if ($Queryform->exportvalue('district')!=0){
+if ($Queryform->exportvalue('district')!='0'){
$strDistrict = $Queryform->exportvalue('district');
} else {
$strDistrict = _('Unkown');
Modified: trunk/rapc/panelpage.php
===================================================================
--- trunk/rapc/panelpage.php 2007-03-22 07:07:21 UTC (rev 60)
+++ trunk/rapc/panelpage.php 2007-05-28 11:39:33 UTC (rev 61)
@@ -40,10 +40,10 @@
if(isset($_REQUEST['id']) && is_numeric($_REQUEST['id'])) {
$Panelid = $_REQUEST['id'];
}
-
+
// print_r($_REQUEST);
-
-
+
+
$options = &PEAR::getStaticProperty('DB_DataObject', 'options');
$config = parse_ini_file('conf/dataobject.ini', TRUE);
$options = $config['DB_DataObject'];
@@ -55,8 +55,8 @@
$options['database'] = 'pgsql://'.$_SESSION['UserName'].':'.
$_SESSION['Password'].'@'.'localhost/'.$_SESSION['strDataBase'];
-
-
+
+
/**
* Handle actions that result in forwarding.
*/
@@ -76,8 +76,8 @@
$miny = $r[1]-25;
$maxx = $r[0]+25;
$maxy = $r[1]+25;
-
-
+
+
header("location: map.php?PHPSESSID=".$_REQUEST["PHPSESSID"].
"&ViewRegion=Quick+".
"View&minx=$minx&miny=$miny&maxx=$maxx&maxy=$maxy&imagewidth=400&".
@@ -105,13 +105,13 @@
from panel where registerno='".$arg."'";
$objResult=pg_query($strQuery);
$objResponse = new xajaxResponse();
-
+
if (pg_num_rows($objResult)!= 0) {
$arrRow = pg_fetch_row($objResult);
-
+
// Instantiate the xajaxResponse object
-
-
+
+
// add a command to the response to assign the innerHTML attribute of
// the element with id="SomeElementId" to whatever the new content is
$objResponse->addAssign("companyname","value",$arrRow[0].'');
@@ -122,14 +122,14 @@
$objResponse->addAssign("faxno","value",''.$arrRow[5].'');
$objResponse->addAssign("pobox","value",''.$arrRow[6].'');
//return the xajaxResponse object
-
+
}
return $objResponse;
}
$xajax->processRequests();
-$dccssPage->add('<head>'.$xajax->printJavascript("./include").'</head>');
-
+$dccssPage->add('<head>'.$xajax->printJavascript("./include").'</head>');
+
/**
* \todo Link to map.
*/
@@ -145,14 +145,14 @@
if(isset($_REQUEST['id']) && is_numeric($_REQUEST['id'])) {
$objPanel->get('id', $_REQUEST['id']);
$id = $objPanel->id;
-
+
if ($id!=0){
$dccssPage->add(_('Panel #').'<b>'. $_REQUEST['id'].'</b><br>');
$dccssPage->add('<a href="Panelpage.php?PHPSESSID='.session_id().
'&action=map&id='.$objPanel->id.'">'.
_('View on Map').'</a>');
-
- }
+
+ }
}
$objPanel->getXyFromRequest();
@@ -172,12 +172,45 @@
//$objPanelForm->addElement('file','uploaded_file','Your File:');
if(isset($_REQUEST['id']) && is_numeric($_REQUEST['id'])) {
+ $arrPassedvalue=0;
+ if ($objPanel->paneldimension==1){
+ $arrPassedvalue='14 * 4-50M1000P1';
+ }
+ if ($objPanel->paneldimension==2){
+ $arrPassedvalue='5 * 4-50M500P2';
+ }
+if ($objPanel->paneldimension==6){
+ $arrPassedvalue='5 * 3-50M500P6';
+ }
$objPanelForm->setDefaults(array('paneltypedimension'=>array(
- $objPanel->routetype,$objPanel->paneltype,$objPanel->paneldimension)));
+ $objPanel->routetype,$objPanel->paneltype,$arrPassedvalue)));
+
$objPanelForm->setDefaults(array('road_route_district' => array($objPanel->district,
$objPanel->roadname,$objPanel->routename)));
+ $arrResetValues = array( 'panelcatagory','companyname','ownership',
+ 'nationalno', 'mothername',
+ 'address', 'teleno', 'faxno',
+ 'mobileno', 'pobox', 'panelsubject','road_route_district',
+ 'carrigewaywidth', 'shoulderwidth', 'numberoflanes',
+ 'medianwidth','date','x','y','routetodistance','paneltodistance',
+ 'routedirection','notesonlocation','nearstpanelx','nearstpanely',
+ 'lightavailable',
+ 'panelarea','annualfees','usefees','totalfees','agreedby','receiptno',
+ 'insurancereceiptno',
+ 'contractno','notes','permitno','registerno','contractunitprice',
+ 'verificationreceiptno','verificationreceiptdate','verificationamount','facecount');
+
+ foreach ($arrResetValues as $arrValue) {
+ $objPanel1 =& $objPanelForm->getElement($arrValue);
+ $objPanelForm->setdefaults(array($arrValue=>$objPanel->$arrValue));
+ }
+
+
+
+
+
$_SESSION['routetypevalue']=$objPanel->routetype;
-
+
}
function move_file($data) {
@@ -195,19 +228,20 @@
//print_r("<br>new name".$_SESSION['id'].".".$keywords[1]);
$imageid=($_SESSION['id']+1);
+//print_r("maher".$imageid);
mkdir($_SESSION['imagedir'].$imageid, 0700);
unset ($_SESSION['loadedimage']);
if ($file->moveUploadedFile($_SESSION['imagedir'].$imageid."/",$imageid.".".$keywords[1])){
// $dccssPage->add(_('Image is loaded'));
- $_SESSION['loadedimage']='c:/program files/mpwh/rapc/data/plugin/'.$imageid."/".$imageid.".".$keywords[1];
-
-
+ $_SESSION['loadedimage']='c:/program files/rapc/data/plugin/'.$imageid."/".$imageid.".".$keywords[1];
+
+
//$imageloaded=true;
}
-
+
}
}
-
+
if($objPanelForm->validate()) {
$objResult = $objPanelForm->process(array(&$objPanelBuilder,
'processForm'), false);
@@ -218,31 +252,31 @@
$dccssPage->addMessage(_('Failed to save record(s).'));
$dccssPage->addMessage($objResult->getMessage());
-
+
} else {
-
+
$objPanel->insertdate=''.date("Y-m-d h:m:s").'';
$objPanel->username=''.$_SESSION['UserName'].'';
-
+
$dccssPage->addMessage(_('Image is loaded'));
$objPanel->image=''.$_SESSION['loadedimage'].'';
-
+
$dccssPage->add(_('Panel #').'<b> '.$objPanel->id .'</b><br>');
-
+
$objPanel->update();
-
+
$dccssPage->addMessage(_('Record(s) successfully saved.'));
-
+
$dccssPage->add('<a href="Panelpage.php?PHPSESSID='.session_id().
'&action=map&id='.$objPanel->id.'">'.
_('View on Map').'</a>');
$dccssPage->add('<br><a href="Panelpage.php?PHPSESSID='.session_id().
- '&type=new">'. _('New Data Entry').'</a>');
+ '&type=new">'. _('New Data Entry').'</a>');
$arrResetValues = array( 'panelcatagory','companyname','ownership',
'nationalno', 'mothername',
'address', 'teleno', 'faxno',
- 'mobileno', 'pobox', 'panelsubject','road_route_district',
+ 'mobileno', 'pobox', 'panelsubject','road_route_district',
'carrigewaywidth', 'shoulderwidth', 'numberoflanes',
'medianwidth','date','x','y','routetodistance','paneltodistance',
'routedirection','notesonlocation','nearstpanelx','nearstpanely',
@@ -251,15 +285,15 @@
'insurancereceiptno',
'contractno','notes','permitno','registerno','contractunitprice',
'verificationreceiptno','verificationreceiptdate','verificationamount');
-
+
foreach ($arrResetValues as $arrValue) {
$objPanel1 =& $objPanelForm->getElement($arrValue);
$objPanel1->setValue('');
$_SESSION['id']=$objPanel->id;
}
-
+
}
-}
+}
$objStatic =& new HTML_QuickForm_static();
@@ -280,7 +314,7 @@
$objStatic =& new HTML_QuickForm_static();
$objStatic->setText('</td></tr></table>');
$objPanelForm->addElement($objStatic);
-
+
//print_r($_POST);
$strHtml = $objPanelForm->toHTML();
$dccssPage->add($strHtml);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-05-28 11:39:38
|
Revision: 61
http://svn.sourceforge.net/rapc/?rev=61&view=rev
Author: maher_karim
Date: 2007-05-28 04:39:33 -0700 (Mon, 28 May 2007)
Log Message:
-----------
2007-05-28 Maher Abdel karim <mah...@do...>
* panelinstallation_report.php:fixed district value
handling
* panelpage.php:assign default values for edit based
on passed id.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-03-22 07:07:28
|
Revision: 60
http://svn.sourceforge.net/rapc/?rev=60&view=rev
Author: maher_karim
Date: 2007-03-22 00:07:21 -0700 (Thu, 22 Mar 2007)
Log Message:
-----------
2007-03-22 Maher Abdel karim <mah...@do...>
* conf/rapc_ar.map
* conf/rapc_en.map:use tileindex for building layer.
* plugin/imageidentifyplugin.php:display the panel image.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/conf/rapc_ar.map
trunk/rapc/conf/rapc_en.map
trunk/rapc/map.php
trunk/rapc/plugin/imageidentifyplugin.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-03-22 07:07:26
|
Revision: 60
http://svn.sourceforge.net/rapc/?rev=60&view=rev
Author: maher_karim
Date: 2007-03-22 00:07:21 -0700 (Thu, 22 Mar 2007)
Log Message:
-----------
2007-03-22 Maher Abdel karim <mah...@do...>
* conf/rapc_ar.map
* conf/rapc_en.map:use tileindex for building layer.
* plugin/imageidentifyplugin.php:display the panel image.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/conf/rapc_ar.map
trunk/rapc/conf/rapc_en.map
trunk/rapc/map.php
trunk/rapc/plugin/imageidentifyplugin.php
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-03-18 13:28:05 UTC (rev 59)
+++ trunk/rapc/changelog 2007-03-22 07:07:21 UTC (rev 60)
@@ -1,3 +1,9 @@
+2007-03-22 Maher Abdel karim <mah...@do...>
+
+ * conf/rapc_ar.map
+ * conf/rapc_en.map:use tileindex for building layer.
+ * plugin/imageidentifyplugin.php:display the panel image.
+
2007-03-18 Maher Abdel karim <mah...@do...>
* script/create_view.sql:add panel.id to the view.
Modified: trunk/rapc/conf/rapc_ar.map
===================================================================
--- trunk/rapc/conf/rapc_ar.map 2007-03-18 13:28:05 UTC (rev 59)
+++ trunk/rapc/conf/rapc_ar.map 2007-03-22 07:07:21 UTC (rev 60)
@@ -1,6 +1,6 @@
-# MapFile created with Gix Export Tool - Thu Aug 31 11:43:58 2006
+# MapFile created with Gix Export Tool - Thu Aug 31 11:43:58 2006
# http://gix.sourceforge.net
-# View Date : 31 ��, 2006 08:16:18 �
+# View Date : 31 ??, 2006 08:16:18 ?
#
MAP
NAME 'View1'
@@ -88,7 +88,50 @@
COLOR 255 0 0
outline 24
END #QUERYMAP
-
+ LAYER #plot.shp
+ #TRANSPARENCY 100
+ NAME 'basemap'
+ METADATA
+ gix_layername "balqa.shp"
+ gix_layerfieldalias "plot_no"
+ END #METADATA
+ TOLERANCE 3
+ labelitem "plot_no"
+ TOLERANCEUNITS pixels
+ MAXSCALE 15000
+ TILEINDEX 'E:\gis_data\Mapping\dls_data\basemap.shp'
+ TILEITEM 'location'
+ # DATA 'E:\gis_data\Mapping\dls_data\balqa\balqa-basemap.shp'
+ HEADER 'header.html'
+ FOOTER 'footer.html'
+ LABELCACHE on
+# TILEINDEX ''
+# TILEITEM ''
+ STATUS on
+ DEBUG false
+ TRANSFORM true
+ TYPE polygon
+ CLASS
+ NAME 'basemap'
+ template "ttt_query.html"
+ #RASTERFILL_STYLE_SOLID
+
+ STYLE
+ OUTLINECOLOR 0 0 0
+ SIZE 1
+ COLOR 255 255 255
+ BACKGROUNDCOLOR 255 255 0
+ END #STYLE
+
+
+ label
+ color 0 0 0
+ position cc
+ end
+ END #CLASS
+
+ END #LAYER
+
LAYER #Adminsub.shp
TRANSPARENCY 100
NAME 'Adminsub'
Modified: trunk/rapc/conf/rapc_en.map
===================================================================
--- trunk/rapc/conf/rapc_en.map 2007-03-18 13:28:05 UTC (rev 59)
+++ trunk/rapc/conf/rapc_en.map 2007-03-22 07:07:21 UTC (rev 60)
@@ -5,15 +5,15 @@
MAP
NAME 'View1'
SIZE 550 400
- EXTENT 253216.66562500 200278.73750000 738982.64687500 718755.76250000
+ EXTENT 4988.104696 -187798.473479 658230.991626 325785.589348
UNITS meters
RESOLUTION 72
CONFIG PROJ_LIB 'C:/Proj/'
DATAPATTERN ''
TEMPLATEPATTERN ''
SHAPEPATH ''
- SYMBOLSET 'c:\program files\mpwh\rapc\etc\symbols.sym'
- FONTSET 'c:\program files\mpwh\rapc\etc\fonts.txt'
+ SYMBOLSET 'c:\program files\rapc\etc\symbols.sym'
+ FONTSET 'c:\program files\rapc\etc\fonts.txt'
STATUS on
IMAGECOLOR 255 255 255
IMAGETYPE png
@@ -24,14 +24,14 @@
MINSCALE 0
IMAGEPATH "/tmp/ms_tmp/"
IMAGEURL "/ms_tmp/"
- LOG 'c:\program files\mpwh\rapc\conf\rapc_en.log'
+ LOG 'c:\program files\rapc\conf\rapc_en.log'
METADATA
END #METADATA
END #WEB
REFERENCE
- IMAGE 'c:\program files\mpwh\rapc\conf\rapc_en.jpg'
- EXTENT 253216.66562500 200278.73750000 738982.64687500 718755.76250000
+ IMAGE 'c:\program files\rapc\conf\rapc_en.jpg'
+ EXTENT 4988.104696 -187798.473479 658230.991626 325785.589348
STATUS on
COLOR -1 -1 -1
OUTLINECOLOR 255 255 0
@@ -93,12 +93,12 @@
TRANSPARENCY 100
NAME 'Adminsub'
METADATA
- gix_layername "Adminsub.shp"
+ gix_layername "Admin.shp"
END #METADATA
TOLERANCE 3
TOLERANCEUNITS pixels
- DATA 'e:\data\mpwh\adminsub\adminsub.shp'
+ DATA 'e:\data\admin.shp'
HEADER 'header.html'
FOOTER 'footer.html'
LABELCACHE on
@@ -125,8 +125,52 @@
END #CLASS
END #LAYER
+ LAYER #plot.shp
+ #TRANSPARENCY 100
+ NAME 'basemap'
+ METADATA
+ gix_layername "balqa.shp"
+ gix_layerfieldalias "plot_no"
+ END #METADATA
+ TOLERANCE 3
+ labelitem "plot_no"
+ TOLERANCEUNITS pixels
+ MAXSCALE 15000
+ TILEINDEX 'E:\gis_data\Mapping\dls_data\basemap.shp'
+ TILEITEM 'location'
+ # DATA 'E:\gis_data\Mapping\dls_data\balqa\balqa-basemap.shp'
+ HEADER 'header.html'
+ FOOTER 'footer.html'
+ LABELCACHE on
+# TILEINDEX ''
+# TILEITEM ''
+ STATUS on
+ DEBUG false
+ TRANSFORM true
+ TYPE polygon
+ CLASS
+ NAME 'basemap'
+ template "ttt_query.html"
+ #RASTERFILL_STYLE_SOLID
+
+ STYLE
+ OUTLINECOLOR 0 0 0
+ SIZE 1
+ COLOR 255 255 255
+ BACKGROUNDCOLOR 255 255 0
+ END #STYLE
+
+
+ label
+ color 0 0 0
+ position cc
+ end
+ END #CLASS
+ END #LAYER
+
+
LAYER #Borders.shp
TRANSPARENCY 100
NAME 'Borders.shp'
@@ -136,7 +180,7 @@
END #METADATA
TOLERANCE 3
TOLERANCEUNITS pixels
- DATA 'e:\data\mpwh\border\borders.shp'
+ DATA 'e:\data\border.shp'
HEADER 'header.html'
FOOTER 'footer.html'
LABELCACHE on
@@ -165,14 +209,14 @@
TRANSPARENCY 100
NAME 'Msroads'
METADATA
- "DESCRIPTION" "Msroads"
+ "DESCRIPTION" "Msroad"
"RESULT_FIELDS" "ID ROADNAME ROUTENAME ROADCLASS NODEFROM NODETO LENGTH MLENGTH"
gix_layerfieldalias "ID Roadname Routename Roadclass Nodefrom Nodeto Length Mlength"
END #METADATA
TOLERANCE 3
TOLERANCEUNITS pixels
labelitem "ROUTENAME"
- DATA 'e:\data\mpwh\msroads\msroads.shp'
+ DATA 'e:\data\msroad.shp'
HEADER 'header.html'
FOOTER 'footer.html'
LABELCACHE on
@@ -188,7 +232,7 @@
#PEN
STYLE
- SIZE 3
+ #SIZE 100
COLOR 68 81 196
END #STYLE
label
@@ -203,7 +247,7 @@
NAME 'Villages'
TOLERANCE 3
TOLERANCEUNITS pixels
- DATA 'e:\data\mpwh\village\villages.shp'
+ DATA 'e:\data\village.shp'
HEADER 'header.html'
FOOTER 'footer.html'
LABELCACHE on
@@ -289,27 +333,6 @@
TRANSPARENT on
END #OUTPUTFORMAT
- LAYER
- NAME "buffer"
-
-
- TYPE LINE
- STATUS OFF
- CLASS
- COLOR 255 0 0
- END
-END # layer
-
-
-LAYER
- NAME "nobuffer"
-
- TYPE LINE
- STATUS OFF
- CLASS
- COLOR 0 255 0
- END
-END # layer
-
+
END #MAP
Modified: trunk/rapc/map.php
===================================================================
--- trunk/rapc/map.php 2007-03-18 13:28:05 UTC (rev 59)
+++ trunk/rapc/map.php 2007-03-22 07:07:21 UTC (rev 60)
@@ -99,13 +99,13 @@
}
if (($_POST['Frompoint']!=0)&&($_POST['Topoint']!=0)){
- $strQueryDistance = "select distance(p2,(select the_geom as p from panel
- where id=".$_POST['Frompoint'].")) from
+ $strQueryDistance = "select distance(p2,(select the_geom as p from panel
+ where id=".$_POST['Frompoint'].")) from
(select the_geom as p2 from panel where id=".$_POST['Topoint'].") as d";
$objResult = pg_query($strQueryDistance);
if(($objResult)&&(pg_numrows($objResult) > 0)) {
$arrRow = pg_fetch_row($objResult, 0);
-
+
$distance=$arrRow[0];
//pass the id of the selected Point.
?><script> document.forms["mapform"].distance.value=1;
@@ -134,13 +134,13 @@
// print_r(str_replace(" ","+",$_REQUEST['searchvalue']));
//$objLayer->setFilter($_REQUEST['searchvalue']);
//print_r($objLayer->getNumResults());
-
+
$strExp="([VILL_NO]=".$_REQUEST['vill_no']." and [BLOCK_NO]=".$_REQUEST['block']." AND [".$_REQUEST['fieldname']."]=".$_REQUEST['plot'].")";
if ($_REQUEST['block']!=0){
if (@$objLayer->queryByAttributes('VILL_NO',$strExp,MS_SINGLE) ==MS_SUCCESS) {
-
+
$ResultCount=$objLayer->getNumResults();
-
+
$gbShowQueryResults = TRUE;
for ($i=0; $i < $ResultCount; $i++) {
$QueryResult=$objLayer->getResult($i);
@@ -153,27 +153,27 @@
$objLayer->close();
$gpoMap->setextent($oExtents->minx-10,$oExtents->miny-10,$oExtents->maxx+10,$oExtents->maxy+10);
}
-
-
+
+
$objImage=$gpoMap->draw();
$_REQUEST['action']='';
}
-
+
} else {
$strMessages = $strMessages._(("Nothing found"));
}
break;
-
-
+
+
case "search":
// $objLayer = $gpoMap->getlayerbyname($_POST[layer][0]);
$objLayer = $gpoMap->getlayerbyname('Msroads');
// print_r(str_replace(" ","+",$_REQUEST['searchvalue']));
-
+
if ($objLayer->queryByAttributes('ROUTENAME',str_replace(" ","+",$_REQUEST['searchvalue']),MS_SINGLE) ==MS_SUCCESS) {
-
+
$ResultCount=$objLayer->getNumResults();
-
+
$gbShowQueryResults = TRUE;
for ($i=0; $i < $ResultCount; $i++) {
$QueryResult=$objLayer->getResult($i);
@@ -183,27 +183,28 @@
//$newbuffered = $Shape->buffer(20);
// print_r ($Shape->values);
//print_r('Maher');
-
+
$oExtents=$Shape->bounds;
//print_r($oExtents);
$objLayer->close();
$gpoMap->setextent($oExtents->minx-10,$oExtents->miny-10,$oExtents->maxx+10,$oExtents->maxy+10);
}
-$layer2 = $gpoMap->getLayerByName('nobuffer');
+/*$layer2 = $gpoMap->getLayerByName('nobuffer');
$layer2->set("status", MS_ON);
$layer2->addFeature($Shape);
$buffered_shape = $Shape->buffer(200);
$layer = $gpoMap->getLayerByName('buffer');
$layer->set("status", MS_ON);
-//print_r($buffered_shape);
-//$layer->addFeature($buffered_shape);
-
-
+print_r($buffered_shape);
+$layer->addFeature($buffered_shape);
+*/
+
+
$objImage=$gpoMap->draw();
-
+
} else {
$strMessages = $strMessages._(("Not working"));
}
@@ -215,7 +216,7 @@
"<a href=\"panelpage.php?action=edit&id=".$PointID.
"\">#".$PointID."</a>");
}
-
+
break;
case "acceptypointlocation" :
@@ -252,7 +253,7 @@
/**
* Log the old DeliveryPoint coordinates in the History table.
*/
-
+
//start checking of deliverypoint values
$objPoint = DB_DataObject::factory('public.panel');
if(PEAR::isError($objPoint)or(NULL == $objPoint)) {
@@ -264,7 +265,7 @@
if ($objPoint->count() > 0) {
//Store original deliverypoint geocode value.
$originalid = $objPoint->id;
-
+
} else {
echo _("NO geocode value returned");
}
@@ -274,11 +275,11 @@
$strQuery = 'BEGINS; ';
$strUpdatePoint = " update panel set the_geom=GeometryFromText('POINT(".
$_REQUEST["PointX"]." ".$_REQUEST["PointY"].")', -1) where id=".$PointID;
-
+
pg_query($strUpdatePoint);
-
+
/**
* \todo Check the query result.
*/
@@ -460,7 +461,7 @@
function distance(){
if (document.forms["mapform"].Frompoint.value != 0 &&
document.forms["mapform"].Topoint.value !=0){
-
+
}
}
</script>
@@ -600,7 +601,7 @@
<option value="394079,485975,575783,568638">Zarqa</option>
<option value="363277,569659,414272,625700">Irbed</option>
-
+
</select><br />
<SELECT name="MapSize" onChange="MapSizeSelected()" title="<?= _("Select the map size from the list.") ?>">
<OPTION><?= _("Map Size")?></OPTION>
@@ -626,7 +627,7 @@
</tr>
<tr><td>
-
+
<table>
<tr><td>
<?= _("From Point:")?><input size="5" type="text" maxlength="5" name="Frompoint" value="" length="5">
Modified: trunk/rapc/plugin/imageidentifyplugin.php
===================================================================
--- trunk/rapc/plugin/imageidentifyplugin.php 2007-03-18 13:28:05 UTC (rev 59)
+++ trunk/rapc/plugin/imageidentifyplugin.php 2007-03-22 07:07:21 UTC (rev 60)
@@ -118,11 +118,11 @@
$this->objLayer->open();
$objShape = $this->objLayer->getShape(0,$Risultato);
$arrValues = $objShape->values;
-
+
$strValue = $arrValues[$this->arrConfiguration['Field']];
$strImageLocation = sprintf($this->arrConfiguration['ImageLocation'],
$strValue);
-
+
if(!is_dir($strImageLocation)) continue;
if($handle = opendir($strImageLocation)) {
while(false !== ($strFile = readdir($handle))) {
@@ -140,7 +140,10 @@
}
$objTable->addRow(array('<a href="'.
sprintf($this->arrConfiguration['ImageLocationURL'], $strValue).
- $strFile.'">'.$strFile.'</a> ', $strValue));
+ $strFile.'">'.$strFile.'</a> ', $strValue,'<image src="'.
+ sprintf($this->arrConfiguration['ImageLocationURL'], $strValue).
+ $strFile.'" width=100 height=100 />'));
+
}
}
closedir($handle);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-03-19 01:55:36
|
Revision: 59
http://svn.sourceforge.net/rapc/?rev=59&view=rev
Author: maher_karim
Date: 2007-03-18 06:28:05 -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/contract_panel_report.php
trunk/rapc/illegal_panelinstallation_report.php
trunk/rapc/include/dcmmaputil.php
trunk/rapc/map.php
trunk/rapc/script/create_rapc_ddl.sql
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-03-18 22:55:46
|
Revision: 59
http://svn.sourceforge.net/rapc/?rev=59&view=rev
Author: maher_karim
Date: 2007-03-18 06:28:05 -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/contract_panel_report.php
trunk/rapc/illegal_panelinstallation_report.php
trunk/rapc/include/dcmmaputil.php
trunk/rapc/map.php
trunk/rapc/script/create_rapc_ddl.sql
Modified: trunk/rapc/contract_panel_report.php
===================================================================
--- trunk/rapc/contract_panel_report.php 2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/contract_panel_report.php 2007-03-18 13:28:05 UTC (rev 59)
@@ -88,7 +88,7 @@
Main, count(CASE routetype WHEN 2 THEN 1 END) as Secondary,
count(CASE routetype WHEN 3 THEN 1 END) as Village,companyname,registerno,
paneldimension.description as dimension,
-facecount,count(*) as totalpanels,sum(totalfees) as fees,
+facecount,count(*) as totalpanels,sum(totalfees) as totalfees,
sum(contractunitprice) as pedding, ((sum(totalfees)+ sum(contractunitprice))) as total
from panel left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension) ".$strWhere."
Modified: trunk/rapc/illegal_panelinstallation_report.php
===================================================================
--- trunk/rapc/illegal_panelinstallation_report.php 2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/illegal_panelinstallation_report.php 2007-03-18 13:28:05 UTC (rev 59)
@@ -109,10 +109,10 @@
routetype,dimension,facecount,insurance,usefees,receiptno,receiptdate,
insurancereceiptdate,boolrow";
*/
-$strQuery="select id,companyname,panelsubject,routetype,routename,boolrow,dimension,
-sum(totalfees),facecount,count(*),usefees,verificationreceiptno,
+$strQuery="select id,x,y,companyname,panelsubject,routetype,routename,boolrow,dimension,
+facecount,count(*), usefees,sum(totalfees),verificationreceiptno,
verificationreceiptdate from panelinformation ".$strWhere." group by companyname,routename,panelsubject,
-routetype,dimension,facecount,insurance,usefees,verificationreceiptno,verificationreceiptdate,boolrow,id";
+routetype,dimension,facecount,insurance,usefees,verificationreceiptno,verificationreceiptdate,boolrow,id,x,y";
//print_r($strQuery);
$objTable = new DbTable($DccssPage->postgis->db, $strQuery);
@@ -125,6 +125,9 @@
$_POST['district'].'</B>');
$DccssPage->add($objTable->toHtml());
-
+$DccssPage->add('<br><table width=100%><tr><td>'._('Responsible Engineer').'</td><td>
+</td><td>'.
+_('Public Works Office for:')._($_POST['district']).'</td></tr><tr><td>'._('Date:').
+'</td><td></td><td>'._('Date:').'</td></tr></table>');
echo $DccssPage->toHTML();
?>
\ No newline at end of file
Modified: trunk/rapc/include/dcmmaputil.php
===================================================================
--- trunk/rapc/include/dcmmaputil.php 2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/include/dcmmaputil.php 2007-03-18 13:28:05 UTC (rev 59)
@@ -361,16 +361,7 @@
"&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1".
"&PointID=".$this->intSelectedID."&action=movePoint".
"&id=".$this->intSelectedID."\">".
- _("Move")."</a> ][ ".
- "<a href=\"map.php?PHPSESSID=".session_id().
- "&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+".
- "View&minx=".$_REQUEST["minx"]."&miny=".$_REQUEST["miny"]."&maxx=".
- $_REQUEST["maxx"]."&maxy=".$_REQUEST["maxy"]."&imagewidth=400&".
- "imageheight=300&CMD=MOVE_Point".
- "&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1".
- "&PointID=".$this->intSelectedID."&action=deletePoint".
- "&id=".$this->intSelectedID."\">".
- _("Delete")."</a> ]";
+ _("Move")."</a> ]";
}
} else {
Modified: trunk/rapc/map.php
===================================================================
--- trunk/rapc/map.php 2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/map.php 2007-03-18 13:28:05 UTC (rev 59)
@@ -181,8 +181,8 @@
$objLayer->open();
$Shape=$objLayer->getShape(0,$Risultato);
//$newbuffered = $Shape->buffer(20);
- print_r ($Shape->values);
- print_r('Maher');
+ // print_r ($Shape->values);
+ //print_r('Maher');
@@ -198,7 +198,7 @@
$buffered_shape = $Shape->buffer(200);
$layer = $gpoMap->getLayerByName('buffer');
$layer->set("status", MS_ON);
-print_r($buffered_shape);
+//print_r($buffered_shape);
//$layer->addFeature($buffered_shape);
@@ -242,7 +242,7 @@
$strMessages = $strMessages._("Deleted Point."." "."PointID:".$_REQUEST['id']);
break;
case "acceptedPointMove" :
- print_r('Accepted');
+ //print_r('Accepted');
/**
* \todo Update GeoCode in DeliveryPoint and related Subscriber objects.
*/
@@ -252,20 +252,7 @@
/**
* Log the old DeliveryPoint coordinates in the History table.
*/
- foreach(array('X', 'Y') as $strAxis) {
- $strLogInsert = 'insert into History (RecordOID, TableName, Date,
- DccssUserOID, Attribute, PreviousValue) values('.$PointID.
- ', \'panel\', now(), \''.$_SESSION['UserName'].'\', \''.$strAxis.
- '\',(select '.$strAxis.'(the_geom) from panel where id='.
- $PointID.'))';
-
-
- /**
- * \todo Check the query result.
- */
- pg_query($strLogInsert);
- }
-
+
//start checking of deliverypoint values
$objPoint = DB_DataObject::factory('public.panel');
if(PEAR::isError($objPoint)or(NULL == $objPoint)) {
Modified: trunk/rapc/script/create_rapc_ddl.sql
===================================================================
--- trunk/rapc/script/create_rapc_ddl.sql 2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/script/create_rapc_ddl.sql 2007-03-18 13:28:05 UTC (rev 59)
@@ -183,6 +183,7 @@
-- History table
create table History (
+roecordoid integer,
companyname integer,
routename varchar(10),
x float,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-03-18 11:56:31
|
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <sdt...@us...> - 2007-02-15 06:56:16
|
Revision: 57
http://svn.sourceforge.net/rapc/?rev=57&view=rev
Author: sdteffen
Date: 2007-02-14 22:56:14 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Ignoring Thumbs.db.
Property Changed:
----------------
trunk/htdocs/doc/user/en/images/
trunk/htdocs/doc/user/en/images/callouts/
Property changes on: trunk/htdocs/doc/user/en/images
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/htdocs/doc/user/en/images/callouts
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2007-02-15 06:56:15
|
Revision: 57
http://svn.sourceforge.net/rapc/?rev=57&view=rev
Author: sdteffen
Date: 2007-02-14 22:56:14 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Ignoring Thumbs.db.
Property Changed:
----------------
trunk/htdocs/doc/user/en/images/
trunk/htdocs/doc/user/en/images/callouts/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2007-02-15 06:50:27
|
Revision: 56
http://svn.sourceforge.net/rapc/?rev=56&view=rev
Author: sdteffen
Date: 2007-02-14 22:50:22 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Sorry, this was added by mistake.
Removed Paths:
-------------
trunk/htdocs/doc/user/en/images/Thumbs.db
Deleted: trunk/htdocs/doc/user/en/images/Thumbs.db
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2007-02-15 06:50:27
|
Revision: 56
http://svn.sourceforge.net/rapc/?rev=56&view=rev
Author: sdteffen
Date: 2007-02-14 22:50:22 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Sorry, this was added by mistake.
Removed Paths:
-------------
trunk/htdocs/doc/user/en/images/Thumbs.db
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2007-02-15 06:49:44
|
Revision: 55
http://svn.sourceforge.net/rapc/?rev=55&view=rev
Author: sdteffen
Date: 2007-02-14 22:49:41 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Sorry, this was added by mistake.
Removed Paths:
-------------
trunk/htdocs/doc/user/en/images/callouts/_svn/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2007-02-15 06:49:44
|
Revision: 55
http://svn.sourceforge.net/rapc/?rev=55&view=rev
Author: sdteffen
Date: 2007-02-14 22:49:41 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Sorry, this was added by mistake.
Removed Paths:
-------------
trunk/htdocs/doc/user/en/images/callouts/_svn/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2007-02-15 06:48:32
|
Revision: 54
http://svn.sourceforge.net/rapc/?rev=54&view=rev
Author: sdteffen
Date: 2007-02-14 22:48:30 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Sorry, this was added by mistake.
Removed Paths:
-------------
trunk/htdocs/doc/user/en/images/_svn/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2007-02-15 06:48:32
|
Revision: 54
http://svn.sourceforge.net/rapc/?rev=54&view=rev
Author: sdteffen
Date: 2007-02-14 22:48:30 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Sorry, this was added by mistake.
Removed Paths:
-------------
trunk/htdocs/doc/user/en/images/_svn/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2007-02-15 06:44:18
|
Revision: 53
http://svn.sourceforge.net/rapc/?rev=53&view=rev
Author: sdteffen
Date: 2007-02-14 22:44:12 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Files downloaded from rapc.sourceforge.net
Added Paths:
-----------
trunk/htdocs/dcmms.css
trunk/htdocs/doc/
trunk/htdocs/doc/administrator/
trunk/htdocs/doc/administrator/RAPC_administration_guide.chm
trunk/htdocs/doc/administrator/RAPC_administration_guide.pdf
trunk/htdocs/doc/administrator/index.html
trunk/htdocs/doc/user/
trunk/htdocs/doc/user/ar/
trunk/htdocs/doc/user/en/
trunk/htdocs/doc/user/en/RAPC_user_guide.chm
trunk/htdocs/doc/user/en/RAPC_user_guide.pdf
trunk/htdocs/doc/user/en/images/
trunk/htdocs/doc/user/en/images/Thumbs.db
trunk/htdocs/doc/user/en/images/_svn/
trunk/htdocs/doc/user/en/images/_svn/README.txt
trunk/htdocs/doc/user/en/images/_svn/dir-wcprops
trunk/htdocs/doc/user/en/images/_svn/empty-file
trunk/htdocs/doc/user/en/images/_svn/entries
trunk/htdocs/doc/user/en/images/_svn/format
trunk/htdocs/doc/user/en/images/_svn/prop-base/
trunk/htdocs/doc/user/en/images/_svn/prop-base/Thumbs.db.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/blank.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/caution.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/draft.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/example.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/home.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/important.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/next.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/note.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/prev.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/tip.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/toc-blank.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/toc-minus.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/toc-plus.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/up.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/props/
trunk/htdocs/doc/user/en/images/_svn/props/Thumbs.db.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/blank.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/caution.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/draft.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/example.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/home.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/important.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/next.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/note.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/prev.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/tip.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/toc-blank.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/toc-minus.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/toc-plus.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/up.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/text-base/
trunk/htdocs/doc/user/en/images/_svn/text-base/Thumbs.db.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/blank.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/caution.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/caution.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/draft.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/example.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/home.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/home.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/important.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/important.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/next.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/next.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/note.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/note.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/prev.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/prev.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/tip.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/tip.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/toc-blank.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/toc-minus.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/toc-plus.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/up.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/up.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/warning.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/tmp/
trunk/htdocs/doc/user/en/images/_svn/tmp/prop-base/
trunk/htdocs/doc/user/en/images/_svn/tmp/props/
trunk/htdocs/doc/user/en/images/_svn/tmp/text-base/
trunk/htdocs/doc/user/en/images/_svn/tmp/wcprops/
trunk/htdocs/doc/user/en/images/_svn/wcprops/
trunk/htdocs/doc/user/en/images/_svn/wcprops/Thumbs.db.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/blank.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/caution.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/caution.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/draft.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/example.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/home.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/home.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/important.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/important.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/next.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/next.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/note.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/note.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/prev.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/prev.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/tip.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/tip.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/toc-blank.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/toc-minus.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/toc-plus.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/up.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/up.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/warning.svg.svn-work
trunk/htdocs/doc/user/en/images/blank.png
trunk/htdocs/doc/user/en/images/callouts/
trunk/htdocs/doc/user/en/images/callouts/1.png
trunk/htdocs/doc/user/en/images/callouts/10.png
trunk/htdocs/doc/user/en/images/callouts/11.png
trunk/htdocs/doc/user/en/images/callouts/12.png
trunk/htdocs/doc/user/en/images/callouts/13.png
trunk/htdocs/doc/user/en/images/callouts/14.png
trunk/htdocs/doc/user/en/images/callouts/15.png
trunk/htdocs/doc/user/en/images/callouts/2.png
trunk/htdocs/doc/user/en/images/callouts/3.png
trunk/htdocs/doc/user/en/images/callouts/4.png
trunk/htdocs/doc/user/en/images/callouts/5.png
trunk/htdocs/doc/user/en/images/callouts/6.png
trunk/htdocs/doc/user/en/images/callouts/7.png
trunk/htdocs/doc/user/en/images/callouts/8.png
trunk/htdocs/doc/user/en/images/callouts/9.png
trunk/htdocs/doc/user/en/images/callouts/_svn/
trunk/htdocs/doc/user/en/images/callouts/_svn/README.txt
trunk/htdocs/doc/user/en/images/callouts/_svn/dir-wcprops
trunk/htdocs/doc/user/en/images/callouts/_svn/empty-file
trunk/htdocs/doc/user/en/images/callouts/_svn/entries
trunk/htdocs/doc/user/en/images/callouts/_svn/format
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/1.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/10.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/11.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/12.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/13.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/14.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/15.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/2.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/3.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/4.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/5.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/6.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/7.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/8.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/9.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/props/
trunk/htdocs/doc/user/en/images/callouts/_svn/props/1.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/10.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/11.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/12.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/13.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/14.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/15.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/2.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/3.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/4.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/5.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/6.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/7.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/8.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/9.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/1.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/10.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/11.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/12.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/13.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/14.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/15.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/2.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/3.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/4.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/5.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/6.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/7.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/8.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/9.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/prop-base/
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/props/
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/text-base/
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/wcprops/
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/1.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/10.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/11.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/12.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/13.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/14.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/15.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/2.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/3.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/4.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/5.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/6.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/7.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/8.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/9.png.svn-work
trunk/htdocs/doc/user/en/images/caution.png
trunk/htdocs/doc/user/en/images/caution.svg
trunk/htdocs/doc/user/en/images/draft.png
trunk/htdocs/doc/user/en/images/example.png
trunk/htdocs/doc/user/en/images/home.png
trunk/htdocs/doc/user/en/images/home.svg
trunk/htdocs/doc/user/en/images/important.png
trunk/htdocs/doc/user/en/images/important.svg
trunk/htdocs/doc/user/en/images/next.png
trunk/htdocs/doc/user/en/images/next.svg
trunk/htdocs/doc/user/en/images/note.png
trunk/htdocs/doc/user/en/images/note.svg
trunk/htdocs/doc/user/en/images/prev.png
trunk/htdocs/doc/user/en/images/prev.svg
trunk/htdocs/doc/user/en/images/tip.png
trunk/htdocs/doc/user/en/images/tip.svg
trunk/htdocs/doc/user/en/images/toc-blank.png
trunk/htdocs/doc/user/en/images/toc-minus.png
trunk/htdocs/doc/user/en/images/toc-plus.png
trunk/htdocs/doc/user/en/images/up.png
trunk/htdocs/doc/user/en/images/up.svg
trunk/htdocs/doc/user/en/images/warning.svg
trunk/htdocs/doc/user/en/index.html
trunk/htdocs/etc/
trunk/htdocs/etc/rapc_flyer.pdf
trunk/htdocs/extlib/
trunk/htdocs/extlib/Snoopy.class.inc
trunk/htdocs/images/
trunk/htdocs/images/mpwh.PNG
trunk/htdocs/images/rapc_dataentry.png
trunk/htdocs/images/rapc_index.png
trunk/htdocs/images/rapc_map.png
trunk/htdocs/index.php
trunk/htdocs/rss.php
trunk/htdocs/rss_cache.inc
trunk/htdocs/rss_fetch.inc
trunk/htdocs/rss_parse.inc
trunk/htdocs/rss_utils.inc
Added: trunk/htdocs/dcmms.css
===================================================================
--- trunk/htdocs/dcmms.css (rev 0)
+++ trunk/htdocs/dcmms.css 2007-02-15 06:44:12 UTC (rev 53)
@@ -0,0 +1,47 @@
+/* Cascading stylesheet for http://bmfo.sourceforge.net */
+.sf-logo {
+ top: 0px;
+ width: 100%;
+ background-color: #dddddd;
+ padding: 0px;
+ border: 0px;
+ margin: 0px;
+ padding-bottom: 1px;
+ height: 62px;
+}
+
+.footer {
+ margin-top: 2em;
+ background-color: #9db8d2;
+ border-top: 1px solid black;
+ font-size: small;
+ text-align: left;
+}
+
+body, p, li, h1, h2, h3 {
+ font-family: Arial, Helvectica, sans-serif;
+ padding: 0px;
+ margin: 0px;
+ border: 0px;
+}
+
+.important {
+ font-weight: bold;
+ color: red;
+}
+
+.dcmms {
+ margin: 1em;
+}
+
+.shortcuts {
+ top: 0px;
+ background-color: #9db8d2;
+ border-bottom: 1px solid black;
+ font-size: x-small;
+ text-align: center;
+}
+
+h1 img {
+ vertical-align: top;
+}
Added: trunk/htdocs/doc/administrator/RAPC_administration_guide.chm
===================================================================
(Binary files differ)
Property changes on: trunk/htdocs/doc/administrator/RAPC_administration_guide.chm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/htdocs/doc/administrator/RAPC_administration_guide.pdf
===================================================================
--- trunk/htdocs/doc/administrator/RAPC_administration_guide.pdf (rev 0)
+++ trunk/htdocs/doc/administrator/RAPC_administration_guide.pdf 2007-02-15 06:44:12 UTC (rev 53)
@@ -0,0 +1,4904 @@
+%PDF-1.3
+%\xAA\xAB\xAC\xAD
+4 0 obj
+<< /Type /Info
+/Producer (FOP 0.20.5) >>
+endobj
+5 0 obj
+<< /Length 2120 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gb"/l?$"Ia'Sc)T.s+ki,-(?0+#?Tg_2sbE%"Xd[B1dpkZ>?S_P*+hPr;5d.53njQ$AfF@LRUf>[At%nPL\?]h8b_qcUYk1dWAc'9P+CM[#@R1Y`/C.)-6Qo),,!J$>DK:1R52(ajTs"q!.?b4>IDVj-ZERH+#FiS1^Q^b)=IsU,:7^4'kG+E+Jl`9R\MX.uTXhXD6Kh_&QC`gi+)h4m"V%SGJ-tgQZ3SZANkT0\5sqmUspf;m:JB?nS9i1SGW_W%Rm_II+/d1s:N*)5KpsTCeK9cEY#Q67B`pbKI\jP0Su)2@C2cPYV28I<aQsEQ]&VVj6kP/a.&"n/%UYYYDsWF0]YHERkitfO+D<l.7LN3:]:%MsJY\Pc\GA6'&%/hTi,GY;rHU(IJNZs!sLZ$sU;So@fAIl0:$^k)3\iTXoHBbtWu\*;G7=G$S[>0J.5+(iEK"h0c^0o'jbZ=6JUVg[0!LjQj<;O\J-ED5sW,o!cmbXe<+C@?_5]0!3q^$S8KLEkJ]sm<p_Zho0#JnJ.8-0V)pIAc5&b'_sUfU+9<12hf`[6C:o@U8i,A:QcnpVsC"hc\/U)^"!pfcTrZbkTLPIPpn9-il7)K\Ck_A-uGtO.`BHj.\15OC(UX(SY^!Q9$rrbbc@2T^MikDYojVAX(3=ePlW6fG^]G$g^r8sG:Pp$&Em.X=9U"Z*YcPF:Vp,%?7sDR:o-Mec\N\TBV3`<!aA?7V+&"6YJLh9-juA9I-a*h[I;+c5TnDiX&&H]f.9\I7tXpir+u5Wc`4e`C#S"c"9RD+Th1;BU!_`PGrdH:Tuju,"U"mXDP/n"[;L%;h/0O2p0nb;R81ko#k'N%_I]Q*7,'u"LJ(#FW_X,5VosX7IEp9R3'K>UG6f-;!.dDE+f"HK9Y&YAF;43mNMfJdFgHL&AF#mjf2#t8Mg`&D"9L^p\q,X46Tl]OLWJ3nBr*%#]R@6o"9Nu^7*K1k3orU6OuuM:8)lE4_Gue;i*b%D"9SN%7$Qs.FQU*-b+u<2o.[e4K!:Q<c1g$.&-rF8?]no^8rgp\s+lhPqD$mqGb'UmXZUOj%0M/H%ulC*]H/(rK'J.UW)c9Co.3"Rq0]emh&8jo"pbbGe57M1A&t`I>=Nk->)%dr-^gUfnR`!'B'1ME8QgCY)$gB!UJk8j5*U#S/eo9Y3Y%&lr3pta)-msg#]ttKE\(Ka1oN35K\MK#YZt3H$!iVTc1&tkqruKhl"8RH$pedXG>@OBeMGU/:`d<N'Y1,:r@$7RK6SI!omjVq0q]!XJSn7ZD17P-,QjJ>1es4HnDd52!tbqQ#kXeS1HdVS:_hD4b`s@=*BS;rflu19+OD,H7.c10\?.979&ssQ#B^_L8;)"L+OI69Lah.Ig,o#Sc:3&n*WuQ#V6"i=pGT=_Ub8_)loi2;^=r\jJaS.dphgqHo*P/EmLpMi`WSXO&Ep1f,Pi`Oj=]'W6\kToeR(&H%g%<rV2orZN8b>B3hh1u;a4F^nYgA&94AVJ&Eq017Ok_<)9]I1X3cDM`,%[]cmO4h2djV$Vu$U\6A%Or4491/FoCY:5ojS:]-nNT2,"PeFO_qUd9uD+B$oaa7ReL+"M+[G0jFA`*L/r\+:&+]2mT`R/h<F4lI92&@<PMObp0aRG>gaLd/B_?0g,p40MfkPVW"*oiQPZL`HK:1&>\Wf=m6"%!J*ML^=cd]Vt5nKjWr:td!--,n)Gh"NT4E\/.`)/^MW+H.F'c7oO:g3&(7Pr8XdZlUh1Ta"+`_p`^O1;LtPIgOZ)Al:dc+1k0gRiX4/C7/Dpp<JSsZgAa,5Kl&!G.Iu^Ps%?pnqJaQ-2].<JiA0j?D<]%D$8tSkRH9DQ8?\(J8gG;_ha#)g%]:&q^`b@2dk3Hh>NN2=3]-SR2#]p1'ot57iQpY^\UJY*?fBb\Yid+1@.?Rm9!r\5Q)6$^rPmRsbNRrH</k7`_ZJ5uuPBVOBTNeXbg0Gf2$U&c-\('iI+O+-gh.gU%A[;`UnDGc-ke!S?'YB9_[f%(F;Gh+GgW/XU_+@OO_8atj+;!bnd#QYJ:'MdEQ8'JgO`&3LVJn[c.aR0L(m_.[/2UskQ\3>B/)Rd.$2/bSdj6ZZ7SGdr&uKah?';f!!skr.<r~>
+endstream
+endobj
+6 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 595 842 ]
+/Resources 3 0 R
+/Contents 5 0 R
+/Annots 7 0 R
+>>
+endobj
+7 0 obj
+[
+8 0 R
+10 0 R
+12 0 R
+14 0 R
+16 0 R
+18 0 R
+20 0 R
+22 0 R
+24 0 R
+26 0 R
+28 0 R
+30 0 R
+32 0 R
+34 0 R
+36 0 R
+38 0 R
+40 0 R
+42 0 R
+44 0 R
+46 0 R
+48 0 R
+50 0 R
+52 0 R
+54 0 R
+56 0 R
+58 0 R
+60 0 R
+62 0 R
+64 0 R
+66 0 R
+68 0 R
+70 0 R
+72 0 R
+74 0 R
+76 0 R
+78 0 R
+80 0 R
+82 0 R
+84 0 R
+86 0 R
+88 0 R
+90 0 R
+92 0 R
+94 0 R
+]
+endobj
+8 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 68.031 564.202 127.471 554.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 9 0 R
+/H /I
+>>
+endobj
+10 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 553.202 209.691 543.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 11 0 R
+/H /I
+>>
+endobj
+12 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 542.202 127.751 532.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 13 0 R
+/H /I
+>>
+endobj
+14 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 531.202 154.971 521.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 15 0 R
+/H /I
+>>
+endobj
+16 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 68.031 520.202 133.581 510.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 17 0 R
+/H /I
+>>
+endobj
+18 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 509.202 144.951 499.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 19 0 R
+/H /I
+>>
+endobj
+20 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 498.202 141.631 488.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 21 0 R
+/H /I
+>>
+endobj
+22 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 487.202 204.971 477.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 23 0 R
+/H /I
+>>
+endobj
+24 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 476.202 166.371 466.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 25 0 R
+/H /I
+>>
+endobj
+26 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 465.202 170.801 455.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 27 0 R
+/H /I
+>>
+endobj
+28 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 454.202 161.641 444.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 29 0 R
+/H /I
+>>
+endobj
+30 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 68.031 443.202 115.251 433.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 31 0 R
+/H /I
+>>
+endobj
+32 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 432.202 139.411 422.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 33 0 R
+/H /I
+>>
+endobj
+34 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 421.202 169.131 411.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 35 0 R
+/H /I
+>>
+endobj
+36 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 410.202 177.471 400.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 37 0 R
+/H /I
+>>
+endobj
+38 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 399.202 183.031 389.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 39 0 R
+/H /I
+>>
+endobj
+40 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 388.202 162.471 378.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 41 0 R
+/H /I
+>>
+endobj
+42 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 377.202 266.911 367.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 43 0 R
+/H /I
+>>
+endobj
+44 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 366.202 159.151 356.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 45 0 R
+/H /I
+>>
+endobj
+46 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 68.031 355.202 123.031 345.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 47 0 R
+/H /I
+>>
+endobj
+48 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 344.202 191.361 334.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 49 0 R
+/H /I
+>>
+endobj
+50 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 333.202 163.571 323.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 51 0 R
+/H /I
+>>
+endobj
+52 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 322.202 151.371 312.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 53 0 R
+/H /I
+>>
+endobj
+54 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 311.202 181.921 301.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 55 0 R
+/H /I
+>>
+endobj
+56 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 300.202 166.371 290.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 57 0 R
+/H /I
+>>
+endobj
+58 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 289.202 159.151 279.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 59 0 R
+/H /I
+>>
+endobj
+60 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 278.202 183.581 268.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 61 0 R
+/H /I
+>>
+endobj
+62 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 267.202 181.921 257.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 63 0 R
+/H /I
+>>
+endobj
+64 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 256.202 166.371 246.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 65 0 R
+/H /I
+>>
+endobj
+66 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 245.202 177.471 235.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 67 0 R
+/H /I
+>>
+endobj
+68 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 234.202 163.571 224.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 69 0 R
+/H /I
+>>
+endobj
+70 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 223.202 151.371 213.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 71 0 R
+/H /I
+>>
+endobj
+72 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 212.202 175.791 202.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 73 0 R
+/H /I
+>>
+endobj
+74 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 201.202 175.791 191.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 75 0 R
+/H /I
+>>
+endobj
+76 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 190.202 143.311 180.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 77 0 R
+/H /I
+>>
+endobj
+78 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 179.202 165.811 169.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 79 0 R
+/H /I
+>>
+endobj
+80 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 168.202 178.301 158.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 81 0 R
+/H /I
+>>
+endobj
+82 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 157.202 150.801 147.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 83 0 R
+/H /I
+>>
+endobj
+84 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 146.202 159.701 136.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 85 0 R
+/H /I
+>>
+endobj
+86 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 68.031 135.202 134.141 125.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 87 0 R
+/H /I
+>>
+endobj
+88 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 124.202 183.591 114.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 89 0 R
+/H /I
+>>
+endobj
+90 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 113.202 157.481 103.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 91 0 R
+/H /I
+>>
+endobj
+92 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 102.202 196.081 92.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 93 0 R
+/H /I
+>>
+endobj
+94 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 91.202 139.421 81.202 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 95 0 R
+/H /I
+>>
+endobj
+96 0 obj
+<< /Length 1851 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gb"/l8TWWE'Z]\='V(\pR=l`>L#atFldd)%`eig!U$_rE-j^QM@(82H[kG7JO0WFH9f'r_7[G2>@O(FB=SN$4Ski[!E/Q]aA'NU=a4a4Cjd6Q5EPCg:@X5hu*?J>Sf_XomgXISDe9^*E.`pB*.SL2WhXrVT;7UslRH,]L"h]_l/oSHk6:1Ng8/QEWc8_4qIp;M/pW=U^@Gmpt"p%-NeLFUVb)8q/8gfl80Qu`Y+<_mO*CuZH+DlQXD9RRZ#%p'5?f(F+F'6RJ1t-KAP)Y<k`'8AHOcY[=(E/F*r>NigL3`q:k@Q6nE35jRW&.p@X_(Vpe4i:s6Maa":e`4.0Xs@bnnmZhS,?bqjbQP\,UB23QC)Qhj*4C/TYA&HQXuI?/"/A20(TVHeuldl%MBE&QO?SJ[h40..M#eV]U$_OAST)HiCbFA,c#@U6TuUWcu9JZ(HMq$Lld^[rYH`P@m]7]Tb,V&&B4Kp\/#J4<+drgc8QOh$L?dkC)%B0J$Mg-At=M`XcieOHs=`a'u1I>kbQ:A[51GXgmLStqPe-r/)!-d_-JH(E#??hp/E!-@)P-L1Q[][OIhQAf&9[ai:-%5;4D40>aUes<pQJ_U+eekF^'rhOFBoM@X:KaW+5>)e%8]5Du.glZIXHf8ucR/!AdZ";2#)$3[CLCQ<L]S,AKLGW#"mad'_/W9buTuSP9>R$!>7g3:#FSfmW7h$c6X]?,.nl!0N?aZbl\7X5a`8&.[H%CP^g4'/RMgIBW^(s%OZCC9ZkR^018cl1(I!#9N6,E8U+VVP%_)4H3mZ#=uBbFd%oKOFAg.6Df,2AI?/l"R]$0GR"iode?:.kaTVd^2]fa(PA@-hPQF$X6G945BBZuOH>RDPXgZ\O'ke0i1W]NM-N=5JX[%RJI7t:&fI_rpf]712c#"=A4T8Kg5J%GAdhrcAfA;^m+e`5a7i+q8Dg>40c,_8&&dgq@\mg"oA!9R!=9&=kps11jTW%sa7^pbNjCq=?f_d&"1M:Ik4Q"Bfn%HhYO_?91;,0(c&oDNB)Tj(#?`dFd%d\alM\0E<MGLdF6cL7JFf@2S`a_gYH6?+/SAX%XE[Pm1$(F^T\ROiD7$=G_eh`Y0MQs:Dd0"i[e8tU/sqCDM7q.7Q;(>mbDS("T7\V3@?X`<=iOkO)S@s_GmH$R"e,!'Bk):O*VI1KND'I5is0Fc#NlU>o4;N#oEi[95##t&Ac]<=F-,Ot8lkder^bk$)q]^cON[nLQ$Bb'+7!1]1og#BI8AsX=_I>3W]->>\'5])55pO:m]47XFn/Y2\fus7h1.FQ]UJ8$"OHN(T(O70oNXVm/eB@;^I#+oY)60[67V4[c)N,/nC"u7H,05"%V5]i0t*jB)&BR.jrPdZQldu,O>7.B.>IYGcJtU1@MS7%N]VVL[o]o6mliV/jdTR\B/+<VMRk\`>#Z0aR8Xd1:"3@#X$5N8YJSjB[>gTrA5gWFfZ2cIe[h6%;O"9N5KL<rU4uY^Q*p:8/FI)HF9rT$4:RV\Lo@pOQeN9$D1-02FQn_D(.gOPDb:qIASo-SaMjD;(LQA75%"hJIM**]n63g];A*758JU!Bc;?gJrD@pRGbH@qffefa0%?cB5QV#$]5q7=aC#d$N7"#+2R%d[[=UOV*%&=[3SX]VA/<^`FgpMBq;gRhn\B;SD=3Q@,G<ZE.`+l'28d3bT"M^pM05sKD^V`hs*aBq6lkZe`"f_">/bg79RER99bTb/J:(gHh]!+I)UNbs7XE[R5i96>O"%YMkC[N:#crH4c,c'%f",YIOb(mC.5s3($\/W<d*qm.OnIOEc_YnP,8Cg79KeEf@UF.`L1':LSD)2&b'!U:rWUFrZ)n~>
+endstream
+endobj
+97 0 obj
+<</Type /XObject
+/Subtype /Image
+/Name /Im1
+/Length 9010
+/Width 994
+/Height 348
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/Filter [ /ASCII85Decode /FlateDecode ]
+>>
+stream
+Gb"0W;3J"?Op04bs!hWY0k9ond\m/!,<6mBF$A<h8VKKO(N:n*lLjlZzzN98$lVjdbg^nbMg4b>]p!)F1pp\_(Nq>^M75:L]8PR[]/;l%c'J!EkT!!$m`K'lcB7[3rR\<Hj$kGL'B"TZ>TK[2gIb,?$T!;DR;pM<l"\GuW>J_7M'8d>@S.:VJ3]um8j!!$)a3VO4;UM'W->Y<r0;m)(j!<@'ZBlhU/AX!Z)J;]5PH_b``!1kBLmYOn4o`,!%Jt0A!=;_8F!$Iho\L1]$2$<n%Q\;p4<+V:+!.[JsjdrfD;+U`fZH/>YUiZS:Sg%D,WMkbb!W\<KYh\iLp%6*%!-gZ+17*:g!74K@bb^m2<2fd8\35)JGVCI'="a.KTPV9645Q!j#O\?ll3Y7tWT*5CRtWB&K6!q=!,L%QenI&QmG'e6e.[?S?4A@qVcN_8(ilT'!.Xnnq2\EAr%!mrnW/lq90E=N`uAG]9a[3*;(0/=5rSB=i9PNicS*g-X_XY'3!6_RXJ\9N(LYA6muS/6m8ZN=-KbBiR]W08HnMS:Q``U^pJ-f:rDTkO.a:Z]F3RY0GWqJE4/[^maDDQf<o7!k'P^fTT501-f&^s-Y<t>V\_J<?9jY+"p*VNC[.HN5nF^UVk[Ij_idK3?Li@.ZRC7!G2a2)PAu=h'`i`rH6l5G9\(?PUAn`IUEC[C'Y^1FrT!2%Te+$ZFf/#.UbBOQOXT,8cBd0Xh*El-=^$71F=K@j(GHOg/R?Pg<;BNAN=2)7]q?T`3KLSlTY]7!JeS9,NSSQ;meu/"VjPpI1RQ#Ca'B($W6+_DWR'P1dau)2=c8AokX+T3\aN(.N!d8)*1_IGH55FY+8IZ?B3D%1:VouUTX(QdF3u.S$aBl5Kl'`rNo:KLe18\u/pkkca\H]*I<h'Q[4YF#XWY6>LM9O3&cSBYi0A>77772QGNE"6Z3#BecUt\Sm\W,'+B'//%)RYs!mVC=Hn^ZE2,LnS5c5hX&Y-9JGFcFj<VWHkd)R>_hChh&&n^Z</,LuCC7!BLAaL*SfeW&$J-KND6)R#aAm:a/\n^Z3,,LuC[:`%6#A6B]AlGdN^'6<5V%9CfE[kh.Zq!)S%Om73tW%3Wd'!5+)FcFj<)SPZ<n?1=8DnLDQ[\N@ba&cKONE"6i6J\62G<D=*@;kA#518YS%tqEno.>]uk7*n!Z>P&42VTqY]K4PZH@"&8=Vg^chWZ76hXt"7Itd>HC-=6+f;M-uX1?o<WTVg*DU[((*mM!p2tTie8bA=(6dKOpUOh`VdFJN)(gm6d2G?9;%X"84hXkKIKtXC.qFIdg*t`q(lFk3?BDV&9/f.kHc8JQ`YKh9+:[`NbbJN,b4+6/s4[1?@>L2%5?dHY"%UUa#\t!W5H=!0.et1agBU4@cVg&!YFo$JjoWs]8bYZWM4jHkP^)EPZUj?@<ldhZanS"5B]qKZHa:3HBB_8N`O\A[!`beIK-,+\rD5;JaSa1TKgQ#oLgDekEQ/&7;VoRg*(s+nZXP7G"#G+"kGHR(nH$-:Ul9.5)TA!W-5-57)Zk5*@Yb=j@om!>`k1S!S<?2"coN[%!F+uX?fTrqY\p*ufFBp+<pL$@\qWbmj=NU?(-S,a7IEsfR4bnO#%W>M/X4sP;gnq-M7h9AP_jm!Nm!?t"nC@AOj43b4B\1R'G&6IeI7=$TPC)rtkicb90/[e[bBokl1?a1in`kBgY1nn\>\%"#le88%>cm1E7YaW_S]PZW\,FFlJch*MaEh/)mCI`#Nb:.CkB9Z\\Q&T)N,BI*,&4WjJ=>C)j;PFtl-ZZs([cN+'6R=\Fd).(k],#M$@AXrs"*K/-@?hdC]i9F2r+pJW':0E4fa4Ha[KP1XE_oLqkSOfrZ81;08(r;$+\'YB1fOXd;*q[S*@M\K=]/>hYWsjh1@_^DEehg57U&`iTo0gmY3Alc[K'EdQS*dh:iIj9:,T:Fb;jFNa.dtZS('.;Oj=qp7e:*HHHs,3)OU$s8>n*$JZc7VQ-PMr_e(`#rYOGTtoIrVbg4P*m$9D4lu8oWpYnU6BE/IO:oAQ[n3aElRBT^8Gk-<r+-[DE2W'm(kEfR8hTetFb5*1`7]mOgbik^!cdXp>jBFXalec2*V;iNi%2?20(fA*LKB*85Qs)A0(f?TD;*km:V1U[(]R!'$$s1Z!-DtUf>LXX"T[KJ`r<s&^fpm@?kTsIIGW^@>u:S%zzzz!!%PJaIfKt:L="K;MsCFDto4_8*9UlG#/&[_tOj5f)U?/aBSZ+gt8sg;JaX%>IB)T[=)'B+&<RVl!:4Z3P3l+YY]6M=aYuP*.U)42cn1dI'C(FmWR$:';)MUoZ\HePP=oVaWFg#:,&bUpXT#a=l/_q$j3l(;*B0qY*X.k#@T'%lrstS?jAQ546a]j:3\`LrGCE;1$E6rIrt'%KdYUan+nQsO3Dn7Hf*]>lWea&PWe">E8*/9r#dQh*MgQ/C,p*_*Rrm3U_bC<@E#j-R(V%s9)e&.'b9-]=7>R7q('`Uio$eHjhT,4PW^42s!f82>FtH"1LIl1<;u.@J@o`)AT&C.ruNV!Tf@2F/q:<If\o^Q$Z#Zb\r+2i?&>Xcf:EUXeYOe2@e0.cp"?strKX4m4t9h)Y]S\bHm$i-ORF4bc0Lkfn`@!4TD!cHXV^g)4>6&4?0]])HX@@6=0RFWWdVD,o"ll*)I-C8;tI0ts'5s),-ni=P"lain@as<<W"\`Y^<`.l#9RJ`S?qk4aq='VnTaTr_o<B]NA:pjueVRl,lek;PrHTo[=:g[/#/"O80j1@`k<+p$pn'?``ROOj=6H@WPZ@*P/_Bc,CL=a"MU_$r0Ngg[7ub$gX4bCM-X#AmO@^!V]&!-7MW;lDq8b?>*nYOdhQaXgV"i/P_^kZ\##(T?4da)'<!EJ,+EgZ]SNIY]]7BY8eUcp#*_@4e0%rHc:j.0lgiRYu$P?KR;:rMVpiHCLN8DK>OeO/^q,E_L``;<8C0t>:?#!_i]Z<7BRH@3jO\7R(^=kbGa&mE$bI=oPm%.:qH<qb@TK+`q9`nX`.*UGC-g@?Lc@%N6d"K_>)a`/k1$#f]$PL0]:I=;]kI&Hoi's/Pk$)R)hDOVno@#X7orpFf4SC2Rr't]?:S\qeTdfeMHsT[Bh>`Z<=uflfF8j2$C[gr7/WCS38%3ASb-4pRe@Lg8@k,03%`98&9K%.leS0L>^W@qmBM^MMmVm2clKSN6#'V[`E_Es3FW9rU)e.I^JP.16FXQ4u.AhD[n2Ng6%@_k!(s!WJ*KX$r5(&ddG?\\os-lPnZFQo:t4]fGk[AGj;?]*sji=GpTtZ]d6Z0[86=PX@p-K-1Vf4/)UAM[QJR=_0lLaoi%eUh9$DNWu^Y.]WIt&RY&UH4`s@-#CceYGBK=emF7,ShhJsN,uu\Oo]h,nFUV$igsYVoY!&[l-&%DMWbQf]r8O]Z%aJ)r**gM?Ot)dOTsJ#d*.0`C4O8>R;s3>oK)5nHiDUs/bLl,In:Q^Q8*r/;Oi*9-fNs!MinK<K$pJ\rs&H=kZX_S($;7L*fMfiKeG$D\>LsonZ-L3V,#o'^MdJU>e\Tq]K.E6"]`'*(>s%`4oRf)]M@+h7://G_Ec97o#Ku!aH*8ZQS?^kep?H-'hbI_Ck%E`)Y,cEDr[iQ"hYRaWI;a8?FmX0]WuA08b8H+C4S@7@fueptQ4^e/(7ui;_8/,>(XioO0IeQ"fYL,3,Km#F+m!X4][mic:<r"t.3,&P@4Qa'E'97D]G")#/DU6@q1FSc>he5uB/^mequ+RneBHJ1f!WPh/Q[=,/S?2Tn^LVFB.FLq=@VfV>C;I4#7'EC>YIA,_harY822VAO,PV0P$n/^%3Dq/'Z<f*k4RZO]kL7oV?apH#"M.?:bHm00q2NI??pM[/IQpd(n@&-]%ssk\3d<`!tNATYFdiXjY9nFIJ=P>_=;+7]D2,mOmB2I-sc?1#gTt5HfVNLK/\aHdiL/2HeH_oYWU7m]r'_ll%b>f+6?pD5Mhn&,3*mrhNa_H*tJ/e&7<Z<nd<P"lP?q#4S\<#:<alanDTZDM\BGn6$[k6_UanU^\r/-AN@E;3HB&ES"D9nank;/A'/RN>Xl^*rfrh`=.-sO%Z`p7HgACc(l/!G+4p1=KotK&=82%M)e\Rr"d,Z(*j*McYoXJSGZXT^;*As5rPN'!c[iFW$$N#HJA[*.I=-)Fnb#sCobB(Grp!Yl2JZ;pE+J%da!4$ekc<$i.1ACEX1_dA(XS5\Aaf:N19<1,4O;tcOd3[\H!g*QmEN("o'f7E^C&kC\;^!$!-kKh8pp-bJB7EV4Mft'nr>p,*\Z]9_pt?ihRVR\BYUje\1[GdnQSc-)gqc_I5!X$F%gO]jU]A_<aP:XXoSOB'+@+A^fD:K4\oLKUF*J+-lglXI/Ms-o(D\e<d](/0)u!)$&5'=GV74E*cO*"j9>Sazzzzzzzzzzzzzzzzzzzzzzzzzzzz!42M!^S_kL!!#sp*-lj]!!"^8]g+3K!s$,8,4Sl6#69:$S.4>\3WK.bW\/<bkl:^&Od<4'Vum#b]#K5=77mdbJ9:05>>PP)J4(jd#,mar!!%k]!k+a3!!$/tFL&"JJ$3PXF@uXba(0l)Tji'BfDY^mNuJE+-7>Y=:.3G$YF]V[!191=:*U?6f3^\s:]N1*.@h4uHELgBh,")*\b7`8?Zqp&Ln<q1So,qVQs>!R(==KTU?>_3dldj7PAACpIZZf;&O"`X4l'$:5YK<:d:X\ukLuu7gBmqZ:>1/Z5*^W2^,<cfY#%p''`da*c.aH=4QQ*Ujc[3]!.]P_$h;%l/<%W+kiiRMlK/-JQ4C7tWA)Wu7.bS`P.JC.J01D6Vq9!a7.bT;P.Jg:J5*m@,'phF8_n7a5ad!`-P8MtWKOjW!.ZgRI6o-(]!E]*dfBG[;Yk2toQ1foFjg?kAQ&A(,6.'bB@R1_Vp>DEd'\?Xj69Q_'>7-gV#p^!OOC&$fBK)Q!8n2^qGd)JSWjTa>X:uSMI*3EdK+kK8Ej(#lZ?#c!,r)jI4BQ6:.b`kQEpNE\K"CHK`cXcmN\P1!"7,MnNBZLK`cXcmN\P1!#La"VkVf-UiZStiHMDVd?girFZLrlJ>_JJCq75<\hFl4:+)k?E1<=q[*\e'AY4idVj#O0\5$*c\Z<]n5b4gIfBK)Q!"usn$,:&Bn"mHkdHbmP3WSR(*d8q(/#_W1oK&P-%R>sBP1Y"@HAY<i7Bb03kl=["r\r/P]A?<UVP;],UiZUrjp\C+DE3E^9gu878a-4C86dW`QASC*YL?)-!0kT/91ffZj@i"Gdn/d('R8Q>$(jKj2&3f"-`$pLa4%afE=PS);pjoQ;E=fI4R*G+;43Y4'tm?iV$$3S\;F4c!l^Rb?Dj"8!EeoGYFoQuV"CYMFZLrlJ:D+0(.u'u6qp+Rdn/d(I(`rEW8S79I4BQ6:.bc,;a$%2/kP;+dHbmP3WPc:=]BE58tUuIVj#O0-KgM_90N;Gku6!qFRu=#%jsNr1#NOZp+**,5Md_cdHbnHR8Wn196_-3Jf2)IYG8O5.=EstSPDdiPB+JJh!*EfgTQi*)8/cmV6`b(@!HS\X/W=f4r(b+-`+.@\R9Z"o;ejpPWfhq:+)mE8\&5FmdV5EZBRNf]hTrOZUq]8D!ph?9O;?\I4BQ6:.f/_El$D`j7eqRc;OL<oK&P-c6hY)Z+7pD0mT=doVq%s\t2jshZ)>*5Ahmd;o[Z7i#]YRjE2OC?-/79Vu-+WdVnoHC7R#]dFc&5guJ-r]ZsFO<:i5BP[:K`jY[s'GCY&<*g>2Y8tUuIVj#Q0FhYLXA+'nHO5FI<3_S^9dHbmPHF;%bf4aO,!UfK)9O;?\I4BQ6:.h_@q=5G`]fY0<2SYgj9BfC&lZ?$N[Eb,jB^FOU?aok(<*2bbMI*3Ed]7N)]LHE"%f")8IOXBDd\ihkl(mrdSM.1ofXh7bEMm/6D80!FAFqpRP[:K`jY[s'GJG:Zq\<*'+";UfHC[f'YL`O?)NDEli/aB+$EEr`PWfhq:+)l>l[3u;`nh`?jF5FOSq!R.WT\Ic.D8pJbA/s.mXQBsq(+#+,c+:*YL?)-eN.&DUTo"JXL[ZOWSn@:I4BQ6:.h_@q=5G`]fTVc)o%*lX\%bUdHbmPHF;%bf4aO,!INW!eWarG8tUuIVj#Q0FhYLXA+'mUE;N^5['e5sdqdnP)P'VqYL`O?)NDElTM2YK;l`&ZqJ7uLSWmH_oAqhJHZq`.k<PI5=g6-5$8i,q:=jb`n(\@@Gfn[N"+l8Wf%!W`6d$)kf-GGuh5B:tT'MAOIZSRNIln:.<9)@%G?KOo%(&!bPg1W;!g]X`Y9JY%$`.r$d,K.F3h)?A=IV3a9tTp&HiHp@)@fPmdn/e?;D)A'<,l]Rc)0-oQq@iaJ(%!RCf2mYD!ZY4IdGlrVd)/,*Ll2gPLA-[>X6YKiT[a,).k*(.T]D_a/6E3Ui\LD(Js(e1$ka[mS2cGEKkcW3h&l:B9R?:eR%bbBtlZ((Fc55%npWb8a1%h/th%`^ReblA:C4s@F]j,g6tc/B9R?:krqTuT:^^[L%SnSg6tc/B9R?:pH+>e6?o-J[QqT^Uo3IQF>bQa!'t6r\!0'%4\[<#ZUq\-LoC2t)1q^01c1bfc6hWS+JLK,9BkKacu`/HS!4;26S8=9J=o(Ch+T2mZUq\-37O+uV=_UfAi_B3:!*W)=o4ho,H-Yk/(7)SCf2kcb1\Y[PWf_^9\4>Xs)d^a,!9H'h#YkNlW#qBqfEnUR-rFI9#'=hWcc%g7UtlsJ4<]+>"Tlk5,OOlX*).h7UtlsJ/5\F:K^L9K-mIZd]7N)]LHE"%Y,>*\QVTIK-mIZd]7N)]LHE"%Y/:qr6&5pq>bUkSWmH_oAqhJHZoHh]-:*Fkl];KFAdFmcBm-rm+h\=kINn>9Mg4#m7Sh'=6k6ZNQ0fq!-PHfdSfqrBjWnM]isUBCGbbQ!2skm0@H3Y?SjcEe%9^"HF;%bf4aO,!Dqb?'J6/rRbjm)d]7N)]LHE"%TnTVUJBgtBBA@m:#qn7C[6=]>WO=I>3F(E2"p?fV>aEi3h4CYpUd?Q)Z!bYQVL/Vf(nkTNP.D]WUl?\:?-s&4moDXL;&nTV3B?.FhYLXA+'n0l8b\2_P'eMK0,!mTeE6Xl(mrdSM.1ofXh6OqG6?Y_l.YVhltJS2q#!R;L5arQe,p;h#U1!.K-SNrchsa`S)6FoS-Yah>Nh6Wk?6rZ?/uj[Eb,jB^FOU96D\3*Ei-BCN*D3_?qB$=^0l<hX7A6:/]r2kZ>?VP[:E^jY[s'GJI*%%fM>88(mR#aMk`E`BUm3dX-0-G#.LFL>!,,^X?,Xo\6s]pPXrYgf&tuN4h;\.Iob$)&%K(mZ!/f8F)kSKhjk;McY7KK4EMV4IVQ'F#'T,[fu5+q'2+3k#%\tc[P0GpSN_Q7s=E;cgG];g5\\0d[a"pYHIo+(On[2JpGile^)CpVofno(/akH)g:aX4m_V,"V@S1ks"'jrq>?dIJl*'/so-S#]5S^N3&$7[O%Wd^[^Sp]N5VJlX:5*ku>5i/>WkRq#RpC-for*7"S6\b[,%$O''49b.0PmgNC,QUON1DUm#A/8=S$r;Yh5A+(H+r;(e5+HV307Gu%%nL[(d\nOEKD\t>6aVG6:b;u/1*+(cbl:bJ,-jHn*,n`tSWP*li1UUqSO2a0D\I2B).=SA5,[2AW$;7^d?+0"0CmH"Pp"]HkGZHXKYNSdCGHQu=g/b4%>(ZT;Sh8R"u[]eQ=_^7N==%MS.<I:t;>YVb:2P6^Bj+ARp?JBZSm+o2[(n98'h+((MMfQY(cDJtHi082-C6H8mOT^-t/mqZHLidtmICrI]T<=DAh(\of2'ds!T<4?\c2[j_8WW,e.:&&:!'!Dt9_Xb!<>Y^dZXh.!bET0B!!#t0,LcUfFL;8PTT1:cmU&Rf=9&?$$'XWOR<no61qMdEM4W#A>m13.zzzzzzzzzz!!!!AlEfU:7011SH'8<s2Y4J\IN(][(f0Q]e=-Ld<.9c3l8MOJJAM.HfX%1=h@qZ5i*Gg1E%0lP(lX[h[#!W1I\V?@[07DhcVm!g+n&,+;ea#.,QIQ8nje%ZbEM;;:gSOmg2<DUZ_d0A!;,aC@30g)n%B)QDi.IH->sn'7#o(u8&b!KCTPkE6_j/7f_ihI4Rj:I[udo(HY*b:0*!Z2q5?Lt^\:3rG`NPF9\q`[78C]78&b!KCT5Y='4CE@iMf^0_r9P=[66D=(P)61]I=3J%mL\V!UX1M)pHP"ilZSk(#PKBk=AeAF83+F?\q"Q:-D]S-/LT+%)BKFHKE+qe3:!Y%;VSinsCrA2g<Q0<7g=&K0KIt@<M$br:"7!mF94sR3Rmtn-WgWGl7AEna8C6,%ErhVrI'jc2(a)8a5@,Rj/GDbT'bD!3Zr`9e=?*B0Q"ApksuC77'uLHJs*eNm*r5Ct3mYH7["<7p;Os[_7fY.V=\l)h;"G^F#9,j"m>(D#D8jZm$ZnE-)Udpu]Zk3G3;Gn)_D%VENK%c0OJ0N#](.CHFC/o'u:3Aj1kJ_`7N'ML;5]Z]-UnAe6sJHY9PMib+s&c:QMK*3pUnna#:T]OG`U7RfRJrmA)#&7?brha*#>.DOdR?[5<qEiq;2;B`pU*8:),c0N2+V\7\X\iqPT1k,Dm4@H'[FR].)M),7\^Yk<g3h-o4:?*-FZcG.`-_-g$`m<hILc(7>6N!a.+"7WTRlk`ie1sqQ<aNd71N*a-i"^i>o'1F%qup&k1U7hZ;)geVs&o,54:?Q=.X!b*MTWjBQY2+Zs1<=+g@fu;dEIA-!ha2(T&,6@J^)f_hN(Q@9MB6j<%P4k*kB@FnLRX!`d?lo2AJ*+%#u<Xo(@.GY?kGo8*.k=cKlMP][s-\GPT3tpguO6M,_.>QrYKPr/<'HUr!?Ehs56qQeh`CUl,@i.@gOR!rtk.M;4SW])9$ab4D6oo5KgS96U@9dT*+8mnTek?9C+.i<jk#"p"_"4,d;'n@Veh@6(3):AUYS!!)7-&aNEo0$LO>dlo,Zzzzzzzzzzzzz!!#C_?O<&[!r~>
+endstream
+endobj
+98 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 595 842 ]
+/Resources 3 0 R
+/Contents 96 0 R
+/Annots 99 0 R
+>>
+endobj
+99 0 obj
+[
+100 0 R
+102 0 R
+104 0 R
+106 0 R
+108 0 R
+110 0 R
+112 0 R
+114 0 R
+116 0 R
+118 0 R
+120 0 R
+122 0 R
+124 0 R
+126 0 R
+128 0 R
+130 0 R
+132 0 R
+134 0 R
+136 0 R
+138 0 R
+140 0 R
+142 0 R
+]
+endobj
+100 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 768.889 201.081 758.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 101 0 R
+/H /I
+>>
+endobj
+102 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 68.031 757.889 138.591 747.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 103 0 R
+/H /I
+>>
+endobj
+104 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 746.889 178.851 736.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 105 0 R
+/H /I
+>>
+endobj
+106 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 735.889 201.621 725.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 107 0 R
+/H /I
+>>
+endobj
+108 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 724.889 173.591 714.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 109 0 R
+/H /I
+>>
+endobj
+110 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 713.889 171.351 703.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 111 0 R
+/H /I
+>>
+endobj
+112 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 702.889 163.581 692.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 113 0 R
+/H /I
+>>
+endobj
+114 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 691.889 163.581 681.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 115 0 R
+/H /I
+>>
+endobj
+116 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 680.889 243.581 670.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 117 0 R
+/H /I
+>>
+endobj
+118 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 669.889 196.091 659.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 119 0 R
+/H /I
+>>
+endobj
+120 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 658.889 138.861 648.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 121 0 R
+/H /I
+>>
+endobj
+122 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 68.031 647.889 144.141 637.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 123 0 R
+/H /I
+>>
+endobj
+124 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 636.889 203.041 626.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 125 0 R
+/H /I
+>>
+endobj
+126 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 625.889 254.661 615.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 127 0 R
+/H /I
+>>
+endobj
+128 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.031 614.889 335.781 604.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 129 0 R
+/H /I
+>>
+endobj
+130 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 603.889 157.471 593.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 131 0 R
+/H /I
+>>
+endobj
+132 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 592.889 136.081 582.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 133 0 R
+/H /I
+>>
+endobj
+134 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 581.889 174.981 571.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 135 0 R
+/H /I
+>>
+endobj
+136 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 570.889 239.391 560.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 137 0 R
+/H /I
+>>
+endobj
+138 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 559.889 143.591 549.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 139 0 R
+/H /I
+>>
+endobj
+140 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 88.031 548.889 128.311 538.889 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 141 0 R
+/H /I
+>>
+endobj
+142 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 266.641 340.686 368.841 330.686 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 143 0 R
+/H /I
+>>
+endobj
+144 0 obj
+<< /Length 1433 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gb"/&968iG&AI1+i0__V0EJnKNmjfGZlQ^.1l"g:$jg'1."^U!)ZBOa8:XgjG+>@`?7J0mrJ5lM=:gDB4*'jLUtfH$h<g%hD[E<_r,<Q#bk!iS6c$DhV7RuNqo.tG?dao>p%0&M?>cs:PVl08k#l&kg4=O(KMP.JXLgZs.Tp-b)0804<u7@-;DhA@A3VnG<:.#(nu@ps^Zf9U0@=T=hj:IFO78+AV#Sft#P-&ug_%@)k"S7>.?"ZQTh&:KUbk<!Mt]_-h^EM>?>C$\b/M<XMSIMr=;]'lIrENbTga54k/K>iU6j%khoMZmB,r%RN[KsG:'A:h:'f-S*h2Bk3P&3Y3hsIu+-4K5&RA,$h5iS_4Jk2LbssJrK9.,\kKs@1*5YX,=JZlpOH61aguPs'/j3tSd^pb#iK46LHr^"NIObECQT#l3(%'Cm,QMRApeX1c,)$P@MhjeHQ83rC.Y)2A";.kK*5jCs!8j0"=ZcaG&V>_C#j_fVo)q>;Z,G:LLe5O4l[>4#OjF:H)/'4`1ROF?")'d\"Jl<SbWV.db/=S15YaR#=^jW3P(4:][-)[c/<#iZfK`nu3@&X2<rD*a!dc?2mp@RTlf?G(nFme5NAqUU4ct9o5$+uf&'P"Q@f@1%H1QZH3GlEsB[/msAULlJa"U@hi?UOjqVg/UXuOo@J$*sD3hChl^8XAB07&XtcRbl1$P-ZLG8tYn;iI(L!a?FkhBou9(A!^dVTp/*$o2]+KA"Dqg7G9_B@e?#&K54>.l:s%)`*(.c.F"3BNHOR3.lU@O3SK7S9.3b?3Xlm[G3NO\)S*jZCCMDj&h`e^IC_@YWUo*p_cl)&7-jnT2*n:Cm^ZanSH/"eH7\]?D1@<>:ZH]4]Hu<*XK#MR2W<-h8$QM,(HSuC=<e<'7-P$NK5jD#J1^tji6\<FjN*Pi-h*F&t)kq=;H>"GN6"JS8`f&s3O@0i.-JL<[/au\;%;W8Pl:V8T]/2>N/TYfZVj#59`"q;<SL)W!Xn2Xm0JXAs[3/l0QFC6Dq[!pLPjNcjZ\kF`F,%N5)fNTFc56bFH4DDJWD<@:%j-&GI24"iQZ"eJ\&4\?AA39UK\BQi5pc;DsB6]GjJuEoJ]W*Lf[pMbZJYg9O5"A4'3<Deea\4hdLMIN_RBA5<bu$FI5%D:TJfm.ATm4b%jK$0)K:P=H%O)u4=cF7gCQHaS1LYN1uCo%9nLTD$;LM!P/J$6h!\AR0J`2>aY_cm+A/]^dj8RpKrhXC#*jQ2TYR7usq^AN-q%aiY*qfk$B/#PlLC>LiDUXh;4D%=oVE\ko:7QQ7QNmB9`!;jGQfM<7S%%AS-Nb2QVO"j12``ViRST(W5UEot910*pNIi'-hlBPAdK0CMpCRP'$5MpoUMQ^9Yl9=G+`RX@&YKm^a_'JTPIcRBj!d'88..-?u_4)81(>(1`>~>
+endstream
+endobj
+145 0 obj
+<</Type /XObject
+/Subtype /Image
+/Name /Im2
+/Length 3515
+/Width 214
+/Height 199
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/Filter [ /ASCII85Decode /FlateDecode ]
+>>
+stream
+Gb"/l0k_7s)i$"D=;\CNT*cd>'1ic]l@Ci[8lJq28?%D65d<nU=Pd,T'J*/#:'1-d9661M>a6q-.8ltss3(A^0^dcac0"H=lm9tV*4)t-Za7,:hV$0Am1dNQhS"9f!gkf?Sih;oo&WF@?GCsfrr)`o"&+q4?bXb0cHa\ZNR[FgkKga?'BSuWh[^bjGl.4%h7ImY%k\^`\$<4.oB4F,"47WA#l7]8_Ed_q%q>K\LDu%ui'BrLh&uus+*c/9hsMThd18>VW8DKbJ`m=[%+B.h?N\[d4K-VF2_ksC^k6D#G0^SErquT:RlC?P0PPF\\lGG20_!c%BC0m>&&>!OG3rIUOHb;L?G*MZ(&-hjc3FP??8)r]Jq9""%"u9$+QN\.+YOZ<H,2be$O/q(0G*f,JWLZVKY1\8j95W/0@O^paiVZVIjt&pg[/0VS7;`^nlo=&n_2749t`$SPTSIWCob-"<%tuiFugX*ighmVf@OkHi_HYYXf\\+Ql@3hbd![GdJWpTeLGmJ.W+QT$eDE0/T&cgXahm)_TM?6lm1/9$DuXp36)MW*:uo5.1pU]:KY!3<lPd#1?;Y][JZepUUY<s*YqI1[@C,2._%;>g7c!p&FjQn1cL:J&!^9Qd"7Vn9Q?re^sG9ZNPe^7BLb;"kKqZIn/"jA9Y$6,O2;f,/YR>WDCuuaX[.f7=;NHSC'2A!TMG=".LSkS/"!1f<B:Yt;`L&GCS4,M&GIkt9W$X]Y\7d*=Jm;tQtF;opm+D.J/-FB7@[<1hpNoXX"I@jBadtrP73`_nZD#G'.Qlh1XHJ2;^&7,?Rqs._[K5<$Pc@CJapfcoE8+jl$#CjD8Qc]?(G!LV_oD$/1bk8JLP`8K'>/>K5n&/\KX3Z(^PE'5fa<;6=)>Wnq)FS(CYu0?m+M6"!K<7#^O6Oa9r2=?Dc>ij5]//(e)'mc@)?T0YI\iq!hj&@3P@WDE;rgF!%=m9XTGPX/idXd<%(h%h),4"9$$N'JRlE$qp[('0/3=24\('iR+Djp[@"C<FpH$q=*n#D_E"7"t!egbg"C,AtlTiR"6#5rUut:?sk0ji4XL3r7Vr&AhgN(@,U,N!u&L9-SR4d%!2OQ'>Zp]0JF(IF92OX_*BA%0G+_8!Ws+P5US6>&I`a_!u!BkB4bajh;j"\o]bDVO)%a`S"%=2VU5qWNP3$==uU^kIf-^g]Nk3^nEK1Os/*\=+dV>63i2STBl-r\o9fI?]gk+9D!?MWN<mdI12O'+)!K!CT?_2Z>4t,'8&R(C[7+:=VQ)B:"r>dZ>(m\>bpm1<6S1rE*g6s3"9"UgJ`2=DRLgaWKf+)ihUa4Z'bs)E]gFc.O`bB(#JKV6Bt]BgXKi&JCKJ+[Q>c02q:4R3mMZ<+iFJT.BF$64*#j]d;$.8,L`?&VhkFbS!i)"hAnjLVTe38l&jG`<V6(9YjTfZ>"9%^.L$`PG&j,(kIhgs"FG<Xp7pcEnaD(g8Zd>V]C<AH1^hDW-jkJqIk"-)sT"=-VLk`I4.`r:W-jKN&nJJ3M8LtHKq6[)76mQDbAmguX6=5XB&fYLJP_MVJ=H[>Jng=^HL_lpY$rtfF0NVP&q171QCAkd&*.7VTBq-gu",hY!@AO\@Fi;2)9aZ+7-laY+#:_"='#n_)O<+3CHV6gWkfo_o9K'2(5FUueO6u?%1&mAoJ]5A..Q#hPQRD<0.t=4C7ITNZnq4!>CZ0MT\C+78eGMDV^1<HtgQ44sHp?J_nG'I*0X0d<O5J7.N\0P&^R3<n#(@MWBmSu`UOTCWC2H)lXNhsu7GZ30ENRZt7[>]YJU[*(bnMkY%h),4!u'Yf_G4KH,5bd"#n0L\VmDo/^dKm'#n0K1".d6C6nlso$qpd+S\W$/0[L+79EYHg(t6;">E^?eYSJ'X$U'i4JJ/.ge'W5qH8`('(^AOm"7)]EE%23")?^$=rHg96(Z+$*p=kK0Jq<1Qn*el>aa:bZ$bPgn"2R5eGWI>Y%.jW(;ntX_0JE\0,OG^?VLX5HfN#%ZgX`qO^4OSQbd\^JX))1kqe[6NF)Z*VH3g[`JWLl\KY1\8j95W/0,Ot?_*H'L#!uWM&FtF(O;A=Y]O2lC"Too$(^PE'5fa<;6=)>Wnq)FS(CYu0?m+M6"!K<7#^O6Oa9r2=?8)r]Jq9""%"u9$+QN\.+YOZ<H,2beb>gIIqQg3tBXca!8)Yp:BO+eI?-ReNS'I!42b]BUJ'$MaGACupU;.L&Y\@BX+K!2i%5e#eXVPh1+%?@Ee3M;rT_)Gm>Jn6b1pBU^A=OK=0UkEU%I?sp_8&J4p\4!FA)!$YH1Rn6Q)cgF@=a!OQl`\m\e<TR_hSa=0R[T_^q`>`M-p/!784oZ1b^Tq%!5rP"&F5B'YqM+0[Kn19EtY_^qb%GciX\M#6R-)^iV9W!t7j."$OH8F>2&D$qpm.4h+/iE`^Ng$r"T_UomSXGV\70Y@%6tmW:MGDHCOFfODL.i#RBY9SmYJZ+l?VJUr8DW_9H89$bi0gD?UIdd>N3rN]SO_#42_RK*Qg0rZe-YHOF?Q8godP(@CaCN4e0%#i$<n_:<<A<[6\;f6/X7H+K;Pcn*+R=Qi"P^^\`<@fqRWdMko>>^D4g=@imne\tF*9=T:4$,OqB3:2J05^ILf<:n<JU<0'IS?b7$@R(GmGQ]lPT_2KM9X:>4!E,B-=ibq/B9r,5=..'kolfgH"C15FL"Tj/UHDZqcX_T,[pH]Yb&e&Zgp^j^=?-SJU<0'IS?t=+nPs"9RmZkjbsmR*"/N\s+hYU_Fhj['XG)(jKJ3;Eb\qkWt,PWMKk#-H=fr]0Q(hPZa6u291pqnYf8D:Hk]e:-SdtX<X.8j-c0o2kqI^EVU>o)NW(\*<FSV'MWIr3]>P1h\$2ejd_OVHDf9Q4s7,1.i*`'.*s7EWc,-/Rn<$6KM&JbA;-<!qr?l!Y`Pf!C;<)/&?t`8Wj(iUnWnOi*#(s^+apce=Ok!GuUN!VlhP9T8?sq@q6[!0@ZIs6L@^&9)_XG!e+`UFrB@n\>5,`l(-_VG;Cuc$QOB,\S3EiK^Z77mmNB<o$jhEBN^+'Tp"8un@QPp,6qU*)22%U0iA:K*DmT%o14*MGV(Md%Hp?e@,/i44M9OqXC@s)qEoodQP$$e;"JMbE_%A(jc!!<nN5US6>&I`a_!u&L9-SR4d%!2OQ'>Zp]0JF(IF92OX_*BA%0G+_8!Ws+P5US6>&cMR3ekP#?`PklYQ!Sq;Vg50P$r#aWppfa?hM$Z;G.V%\b*Yur:*UV>7g$BQ5VUQG#'Qts@%\SNlr!r%5X-1>V$;O&ITVs'@\hT:o+beJAd/@.YV3HQjms3tDf7<'JJuAs)@2Z3%"u9$+QN\.+YOZ<H,2be$O/q(7N2(#qtGjV+(??P;/Ms0^nmm(_o"hM"=GZ-%/L^oKEX;h)&V[@?m)s6d(kfn"U9Ptr<Du]=(!/\;)3*`IK]q-)mOt3oIDU,g^"*bkZ;.7\01sTod_^-gb8h#l;q@9\7#T%eB`C4lI@`l#HhFKT(5O?rr<+Q<Yt~>
+endstream
+endobj
+146 0 obj
+<</Type /XObject
+/Subtype /Image
+/Name /Im3
+/Length 4622
+/Width 186
+/Height 243
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/Filter [ /ASCII85Decode /FlateDecode ]
+>>
+stream
+Gb"/l^MafV'Z[CJUkgFUSIc?H+N6p:<%%oEW$3#i-W($j7C#f\+CPBn'pT0$i$qG.2g!+MO_D6h^_14#'ce_P>Yo=Pg99pY4F=^7DL\1#kJ!S*g7=ef?/L&-hV@qp?'[)*eZ2b1`+F)hqXk((*dCYpH1U/?@Y8t(q!n(Op1,rKW:KfXl`&N9?G(N&q=<Y%[r:0;HWR5'$E2,=kKa`H.Vt4s_Gn?pKe61kKW7_hD36:l;Is$@Mc:9W<Mk[jOXah6.aru$;FQhL1-KK4<"TkF9ESLpMPsQe3k+50_h["$gQsNuqG(i\(G8sk:rR7]F6=#khM;X'fs>;s(Y-?W[f$!fYCHTNGK&nJ,'b:>_M`4B*b:2u,?ogCfcp@8(?%cl#X>U`plR/FcPbGWEcUaC1q8sX_e_4uA(Yg@E)=q(8,4<^_o'BG=%)pr1-p]/]tO1/hm`BmC^=ZebOP*W-LQ*gAoKRFK`^W/mUC4qJ@0?jW<tQ'j71OE;3lQ_D7&4`3!6a#CihZW76?O(&!!B6MndGiE9=T^/XXI1Qs`6@p!uIACmP32"&agT&[a;NMB:/I%"VpD7Sb#0h(7.g7#c#l%32cK?l'VJ$\#8N+:O2-fRh-]],!u*26sbKCb4:LI?nI\W6!U([GsSeLMSpb,8)V[';?'jHTCGLHXd9b4UeTsB:mZ],@PngXY$%WK'b7?fL0+FX?FcqbU1ObcEtIL`JZL*_(k:[5eo:1L,Ca,g"!?#]@b!ZG%7X:/:H[)@ga))r+i]-S:tp1_U&nKK"kcQ-S$c80FD=#js_4,6W)3?7"Qe&`21?p=DRG')"^_fb\aUj9*Ep1`Ro5RAr<[OM%#:W@7uu00VQmLF*Zn]V9Pi-FCS!0J6@V8/K@Z.@u8ST>8U-ql-'EV#f5C"rk_68G-Ff\Vp\G70Ni@S`(YqBo:0Wm!7>cJ05fe^ZTMej:q!IAQK$d`@mY1<\O8a`Z:V;(JY1om*J<<^4NG[>MB'^Wif-ZQCmW8+6`=8/NMT$PYN:(:F"<,Iel^rpBp4o9U/PT\n0;.j+5%k9a;3`)[Ko+'7JMus_N/LFIUnB+,?ohnhV*Qs4V>m4nDV:=AgH]C/aqQ0gY1@Bl`')0f</C`F0tD</Q])[=jOL1bPKfpZ=UPe(*ZsFa;,t(4JZ^"Y-QLPmG>O'2-.8+hnEt#Z0=?Lg4DS0s8MssB7D4Fh7A;%D"Y't3sjYnjO31=(Vm`+QEH?%_aV#`7^fB!feQfC95S4_)NZPg7CL]8[]BM_10e?_D.Lg.O=e?r@9`BHJ*WnFbKH5*=.8u3s&CUN+O'Bp5%,&$Kh'#rWt8:t*7_<Q-l0hhR^*h,n%\l`\mk7!=Es]7l"CRmr.MJE-^+kjUU$rO1[N>WCb-@^A][?#/X@mOLuOB/PF\88F6CjIp=jLk]Oc:SCr)o'BS87ZZ?_;2W$SMm`^;:,`@>N%!Z`bGSnMP43rHAPY)-cOYJ:)5k*p;aGO`d&T7$P'\,ZBt:V0]`&6g^AQiL8QZ]#r6%<1%<D,q'T@p%Zr=CE7`@-PNZQ\ST*XPg)n-jsg]fi;k#UAr(eC,>GL^].WRHM+>B^)EOHg&/l4Ir$hoD29cPNDn"^XIl$E10@[>c5-jiEZd_>oSiqbS7ncLjscV&ZZ<bgDNkKf<"te+2WJ4@7K8&X`Jbq2@);R0f3aT]6,<<fcTbWZ0K6ocbU/YlQ6YmWdfJ#F[$&(&IbDFd^gg$'YAuA:FGpr5XlM,Mid!(I0S](12IH8ZoIoe,cTf=#cThHB65B(1(LMRirV)?o4lXqAg.RkDZ%\6!Xl.YD:91L$b_Ikc).E$>BOF>udB'"MRDoY%pj=Q]I4L7je_mM*(SNFQIJ2>l>@<]Kdc==t)eBC)RPKg0L#Qs+;RD-*iKmTLBD=TX@>ZA(.3UUR,Tc'j?)AI^/2mC<)<N110(!#!R0X9Rbs_I+qr&sV;?eX'gWL_@_i1ROMKN.4YU"H!#F6+bjU#XijXdEC/M-B4Nb-)5h51&pU/c(c-"5X,_[et"X'F>`R7&i_/7[#!5Q14Q4G-,a=ZU:DABSppq!&iNad6@`M#^YdPjQ4;lZqT!T-kgR9Jo:bd!ldc9>)2\KIqMj6L2^Yg;oRT7hOE0>\$KEA4rhqLhmq]ZDBIbV:/:0[LAMb[dXZ_rF9E^E+rtnrsuO0SJWNUA[jS%KrXXWlMe&oA[jSC7""TkJ#luP+"jPHU+1k&OK'n5U3A/5O=`l/G`XLF[WlJ'b=R_DXDAb,WP4\1.f..&&+r-POe+.m^<OejNR*_5BoD0\fcp@8(?)0,>COn\/SWS2/c5GB4$,MG5CShKC!`D&VFnb,M#Pb`/YOX'Y9Ng1(Uc`31q\_0&$=Sa<2JPR7"8n%QA)=q]Sbn`/_X+"9#I]crm6r_'rj+'MWbSQfM\hD_lJUmd+jq`W\hAGkRS,>3Ih&+;H:$8XP)#oRj*-tj7-#I6o$/\#X>U`plR/FO),DWA;fq%>D+*O,5fLtiCC<^5I*`QOY+G2C_;,,MsqrqKHJkkr5]Z48%&[fZ:4PN/]*Qb&Un8Kn0;.j+5%k9a;3a45IS4Np$.:q2]",R*08.rScAQZlOP%!n>LC!k06+Y^VOaco#i[,Sc&$<a4oA'PKCb<b3RZ_/';@Z54I#s5@I=!3:i%E0.pVGI/EX)]6E^9Pr.^G(96s'q/b-HQ7?UqKe91EFC)L`Wh_rH[Y1YSbAE@k6_n!l,#tKd[Rc[7d\8<^<Mk[jOXe8F/R'!j1+h-&<<c/J[ZmaH4`-*V)*6#ZWDI.EfHO<.TV3sfW_DTa4FHpCH[GY<V+]^&+`m),\ZN!9g;>RK\58lVflH9$*GiA#!sc*mdA'5)`]ebC%,mpApum&>;aTBY.K%7&iCC<^5I*`QOY+G2C_;,,MsqrqKV)dk3B0!C)M$XQLSLW>YiY+`hS4PYLTnJ$[s-lPNQG^_?ZY0@(\Y[F:/4Q/o(IOC^6":*R'jiL_rD_QE"_OdAeluYnMhM?>uP<YG8Ik*#/d^*H0;02NM"V[b51$GBYh^::HCn:56pnMP\^XJD9R@j`a0-e,b4U"*h7c^!UX;X5t&S`k]16_lo)_MRE]?r[Fg1=G-F.98$otL0>:1Z[0;'QTa]Sn*+:nF5P_$*N"o3:Obu>G)qG$e$Q"MPjo[i7\!t9QGU0NpT:*ZE91lW\f\\kN/3$bCa\HIm9IM9Kdoq1%ME[.Sb_\Gmi=7FN,O-B(hG7%TL$KL""g09?OSs;(*5X>_6X))LKPHcLd3l5R=#>IuUCfgt.#)Ouo1[*<cK.?8g'[aT>E2gQ9c*oJN5-0Ke5FkqBFEl`%Z#"&[[al[=WUB6kDp`!4[$(C6eU1G.uLXgl9:=^oTih:C.G_&\Ll2b:eVFmeJ=cm^`SG5Z'seNP>AcJW`8VqgTZktR^!h#,eR.3B"-dC7(jc^>IqUj=i3H&DEULu#X>U`plR/FO),DWA;fq%>D+*O,5fLtiCC<^5I*`QOY+FGg:#q6:W,$d;j4F;n(tb4g=eURW>GW1dE)-F(?]ZqRlULehLAb4>e.0&M[km'[d^stI#mgGZ*GYbR`#tjP/?hQF4l]\9l)gN3h#.]*@k@BTSY7Lenb^H\'j:'hS"7n<k3/+^28+eK-Nrl&1Hu(^VB(#YJdPI[rAAWmrNHDC($1t_in&PS!5K>aHdCj;N5K!OY,,)Q4V_INGJo`/_.q.&D9s@C^H4Ue]=$ffi!fG$'?giaHdCj;U)F^d4>6&OJFH]?bTcZlKeCMEFF"Fj5XWr$V+0SEaafrZM*;2qEU4PX@eE>=CAteCgKKQ8f_)4ap=<&X#O=eC+mbrXArJ,@kc)A</u"9>,K:<ZDGY)fOD5t=jG;bLY9>HK7tH%_Q'UYb">]:bg'^p0<K+AO0TTCMq9\PfanpYB*$?Jdcf$KKN5kATr^AdCrokgKcu.]#-H*2G1jsY`M:6ZfL6l%3]K*,Xii-lE%5i5*>kZTs-k!EA*S%lbB,:,a$\EE@4^X$,V5reSZGR2jagKE9.APW[;$)9/!ul(&"?1/K_9T-9N95.@3u<d(AjS_P8rjR;<]HHM>H26Gb6MsCu8JoQ7`W:_>+f'g9k_%`Ie?lE0mn=Tn^d'ZZ*q%$GA@KC2m>0_I-i%>*[D&)_Q)o[D?"WR4"'<o<r3<q!d60]a&MOCk34D<%[caFr2D7jI&O)b=%_#0SJbLBYe*Jc>uHu0g9Pm377G)N:Fj/o5]8rUrGaYCuHai17p.84\?H*PV&Ceqck3BSF)LPgq>HB((u'IbJ(Y<3Y`0F2Yl,X.KRf:n/Q6$9#1;pG*K0<i<FNJ]/ONA:YssFlHg][-.=50grPdT[^\oWQM%o]YKml)K`8$>#-$=NG:[ieCoN2+kmlC0#-t'HZDBWn9,bm;HH;E?O=b/h>O!A9\jNp%JS_<@D!;GCnt-+Xg7g'N*Kd-LX.jeh30>e\CiL\(1>1YV[Uc\_NGQ`/NAGH_$dlFdH!&DBo\UG3+(U<!,?ogCO"J-0a;2&1QMpd\SXl=4+$[m`;/M5jOu9<;+k!%#Q;Ei?[YSs.,#pDO,"cZ#WfkI>Z,i5bWarD('Po3s-'Kq?Zn3#mA?nW,[T';jaVHV?AZ7/IC_=30kKfc-WX=!6^PP9n390ORW@HhUV-qL/~>
+endstream
+endobj
+147 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 595 842 ]
+/Resources 3 0 R
+/Contents 144 0 R
+>>
+endobj
+148 0 obj
+<< /Length 1180 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gasao968iI%)2%/kig6,(m3<hDbccKfkI?ulohKF+A9)\WEpmMosDJ_Bi>cj<GFS/&?l-9+$K\;h`;9PkF:K:#pPbJT)Ok6U&b(.(aG)Nf8g#%UVP,(kO,nOh=lp#`OXkeG98"F'BH^YKB'L4#@EG[@&CV^+a(8Zqp4O05B_Y7\@3aQ[)L0XpAA/G->KEZjumM'k'P'^Xo$`+rhZe*>jRlZVUlAd8(V,>>b@S*#n#HfRcdrG#&$s<c3:O@e#AM^/-j13/"/:FXG/6PY5#7%iZ>UE)_(TsAFm9f%L-U-YNqO!+<9m5AE#g#k5QC^^]B>+jtIl?QhF[[,%m7d0/ub4`RJ@Dii94/g2&rV+g#f.oXLeFct+)Yd`P]k/(&kX9NpT6Ve(O(X/c52a`ATl<Y+C"W0EQPPNI&d;9":K#G.cLak[CE-q.G$Tnin/UnTS4`:"?eQOBMn-*co-\le<'`s"QR;ngLPWZ0.QA)h<.E.EONfp/4"OY`C3^1VHeN,uCE(LWTS6(Lp+@q$/8JFm:0]MB[J.03$qU>@-t_plZ$Bb7%aC878t4N"@DL$7P&Oa%?jI;`Z4`rl8&RC%:g(mmGC7,Ei!kU"6pg1G2*c()hM:;I>g=XntnK$Xjsmd9gmrFr5CQG$^RI!kd!Km,2"K8R*rj_2@a8K?F=[Y?#QhNDr\WQqlBOc'7DX(KK^UE*s8&bj)6d!qH$AE98gXNl*>Zmrt&F&jt7aa_+a$pI.Z;q8^o$o;OD<+u^m:K7`AJdbDU/Ed&<4J0J-Kbh\>X7dmbT0#IPXK3)pZB;<$:=!O_<1b95okCL).ld/UC@=M7.es;ld)6=spY3W_SsQo+:'K=8h0AA'U"$Cns,BJo,h<(7^G[PZ2sOul88g@8nH+B=&XT\OP\"q$M7,8'oRck,*oY>5Rt@:d'duSeOCsGj?-0cQ42UueY;hR?+c.3_J[WP-+#o6Z8&7)j4t`3,oN.oNc^P)"8s\h@CNHu]XGRU>fH)Z>o-6UhG*R#nQP)Q,C;e`[bsFf804seI12iA$9.!;:=PR$2-ch?</mf[NYJ4Hf%MRp`O[[g]?-208ba6rOq0C_M)^Te\`ecc>R.W7-0_\u3`)j^,lK;.]l*%KpOMK[4]PR.rf3BefNgoRD]=_H^0+[_[pT9nuh+TYG25g@9,N!hE*tloAdJ~>
+endstream
+endobj
+149 0 obj
+<</Type /XObject
+/Subtype /Image
+/Name /Im4
+/Length 8696
+/Width 474
+/Height 272
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/Filter [ /ASCII85Decode /FlateDecode ]
+>>
+stream
+Gb"/l0k`,Yq7p>P<9-%`eK]6&KjX0n6np<#+iar"0IFWI2D,V=OiDqd!ZO)%&dGtp^C[1J.9+6F0`q)IB*a)ZWc1s!WI0C,Q(*j3\F2Y#p24gCG%Po@p@g)UhX'UqmbR="5(,4K=&kacjHE@\!H_seBBS1Prca8n$ii11.fSFc0<P=:o%W($p*W*#ajnqld$HFO$(tb[%T2c:++O4V]C03=JGu3NfFCod/G-=>_o'A,^biR5]0jOK(/saG59#N<5PjT=G6'&+:Oi5if3a"J'gk5k'jp^>Z)[TbYJ2.J>QE4AeQ6+7MVi[=%9*b0n5OeKXc6149F"GbhVR,Hs8Mbbs8;&Y(kPRcnb#p@7`@&%<5maEs8=n6I,ils'uP3r<:P*T)l$l0%]3]<p2#\F@6<&>pq!5[;)(`L=2idpg)(RBFu6/m\r2PF0h_gJ`Rg-0;))lWZ\kqjgDC[CFJu88H>2F6hg^.>aUDRAr9-X8P)H76_J<Xk<".5aV2DIC2Ej5cgj4?39GoSPVk8FlI-kdX0e.qBYYN0hfGOJ4ho;T3VF,unYH]hSUSj)Y^3ob%47@Rd_$?S6Pg3Y8ns9Oq@q4^o:E0?5pV3'\1];t,!/^O507UOE]A&ufC^`IP\"AZ[oVXqPiue:lHGfeNnDF9FpU/UZCVE`O1%YJc"1/(J6Yrt]5T?p^`!.._ZiM+5Cp5WZ)mF=3:/4Q%DJk1mML<7[!,]Nk4V8DnHLqI^2\=Q[;XNE#^o_R)IXZZlI!U,8FMYcpq-7Hq'Y9RkA"(YS?MdWp)p6$F4qDb`!1gsGI1QqQrJljV#Tar.)h*-\lb4'k]&K!_ZE0[YBNEA_/SsdA>Vp>60.nli[/_Yl`r3`nblkNGaT>``&$&%10_faHe<Fuj]P_59LIKqjd[%l#ZN^&#<lqeU@.CQTf.5$>lTmKq1YB3%fXR@-2V-5VQc4<O;#;V/O_'Al<QLK]W7tEcY*f_\!)rOOje^O0&'O+`VCZC<>ue'ZdC>F&oRO)Pj8NHHAn(Dl=cQS5V^7dr3*9XI(91q*?+7'_jXP?#WJ/p/XR`i]=SF62COBHlCki/?$#JB=Ctq\m)f(B^RolKOALacXD-SYV-I"Gn(#5/P;7_>omdKW#O')-l\a+QQC^f(Gho=AO@^oQ#X!%G\\L"/WiqCI7Z6oDnpfVffl9/_Kceum<@cIY:NH"JAP)VAcRMn<#(#6I,>1\aeV*reIY)T7u.C=9`Q*E&[7t2InJkhMPg+2Ra?g+ob?(Z!o+d%NYIoe3'*mM60;mIs(latUST&(1RQ/k^d)p;gNFkbG"#1plF,%'<ZREt&r<kV,uHIIP%U*\Y4Y*H2lN/_7-K%S_h:qaN0k3M);G.m0HY0qpY1/dQ._R`0pqS.T!"hCu#81`3'?Q^XumPZ9QZ@7Y_.c$U[2_:_KqP2p3Af"#X3`QAd8T5VAAEsS$QK:.D'tZ1lh5D5&[g=Os;+?;#1=CYRebmuOUHt.!A$-PgPpSu%91V"86TcK"D1$PO\$NCsoPa]9iooSSbrZ>F&B)R0<m?&/b0gmPX-j<C&uo-!pT#Nue/t9&a6d)MmP_#)CUn5o@K2Y`o2=AjT2EPHPCfBd4:.B6(6<1\f2c%eWe5f&qqJN`AMECF]J^uU(7hJd^!TOeQKZ4hDU-T5-L"r`h]TLrN*d!tEB`U]C:VWpEJB.k<+rbKrL<7Z=3YI@ol`0,Fn9P*"6c&\A+/6eCN&-j6WNHgd0,/7+Y5e9DM!jXJ;s.d67*.gY]5C#cPp(a\%'`L^Y[W-I(WkCbA(a-9.">P=UOh+5eV%1B@"TS!%/Mk0&*(/itu1agq^pTdbi&N%SDL>BGB`k:U@>#%FW]+Du.eEVd`(">!-)"]?o3b*N.uO\6;)%l5mKI._H"u+<];r2m@:njS:?5Rir7/1F&GKCsrjs"<6M.2U7LKD%%_ANH51@k6X&$fO3ap=?0h4"pZ)7Cp5WZ)mD'8"rdZO!?6BuI/3=?K(@JsDp;n#s(b$fS=Q4Qh#,Q'lScOq<UGl7'K%n#6Cjb&OUNfK.np\,1A*021+If8rkpD]5Ule_=_:S,5tp=kFb)*E(dG7ek3Yd)5::,=2,.LL_'+p$?K@j7h=&o:eQg_U:4`Z>dRc'2Vr!oUd`!&jP<aD%LS)]&MK709]ua$`ZY-.o^-\1\JFNBJV/ROQ(m"i,PK!,V!VOjcu12D,!tMZdEtO,9B=9!E:9E*jjj)gb9>1fK!c$\8*u!I<C$NbWc^GNb[s*<BecB5'Pl5%*CP^r?]%e&J[<fj1%pN>HT!Qtki[fF0Yj!,S/*Ccl%.0dHi?-NG*H(MjN%^r?\r`o@4A6Sblc!jM3>_8_QFCn-#42W!?KB7N9eYV@C*)^cbfNCB*uO*Ut>;,]a"Em!%E!3gGEYjlrUb:-r]!l2e^^rGDG/>nGd$NM+n!#pucZ(*R-/c]^X!,Oc(`cB5S3"jFVi)7?ZJrRgo=AB_Q7j>cd2&;c:)#>ZWJrRgo=AB_Q7fjVKfXO)s3!NkQAS`=mCi!M>p0cntN9-;/E?qcnJW8E:NFOZ.;oZh>^r?R:D@\Xc_,sGM)n/-$Y64q<7WH7\!B+gkR\;]jrTdgC^,NTTND!`!Dbk8jW4OI&1+mA_O+<RV1j-Cjk2p8>T@_]OhVMFmf"AN&W)l/I5M&mcG9l:U<pI2s70OWs"?,ZM2NC;Cb=2mh@IqqoZ@$\5@VZJa%]&1\pt/3GN`TB-X<h%Wrd&pR&m_QgdKg^0QNT57"#c00E#X^1oq`!oQc5Ai:ogcG\icJ,FOe3Zqtk_C^:_+C68q5s`aora?7iiB41/(sCOIXkB[lF72qMD^C=p$AY]1bhEBGGu=NopM<oRG2.Jo88AllHn`69.`\q7%o<nCl<Q!:2g%B?eC7!<2dZlV\XI4o6-@,mEc`dPYBnVEO2&CK06a@jcT\-BBVR]2AUC;gAr=,VU^2N\0*kP=qa]Y%So$hD_]7g_*_U'hq+f>5HQJW9PWNT1W+`Y+2ehqY$4Pc/DpJnBWmr_sh@?_3KQ\S&nXqk,+;`4?lZc5+K%\tC?a<stTWn?sHbA,SI@\0S:u+0]`I,%W5l`KoF^koD=[^-">L2RJJbRoC04]=X0,9UjafjW>s"rTi0;,qh.;81GuoZ*&NrCg7V*\.@4O*jL(^1t1b#Y-8DJPr@3b43M#V'sohW^EN8=[[IL7[%qS@r>)UCHt.R8Cg7V*\.@4O*l5l9lYqYp+[(*R+(f?>FNe^;*N:Tj7,#n$[;iZM/()B(8?@F;ZD"u;2D,;Pg]qX8O+K$SJ7.E#^rCf<`pkJPZ3^dp/r??uUM+]Qr'.%'*e97)ZbO8Ii(?'m3t(oAj:4)>30+,8`\j71grE97\E80&f?W]GP7r.,!3'cT/m?:7$nn)C*@[=5=,rK*!B+gkW6;&hZ)B)o@l\+:*/RM$Ps+6)0===)*^6kq8(u!lrRBBg!@>4M=iqg<#&<E?+nmG;W*nZZ@,i)_jcm#i,XU<fhOmR`DH)*f8V[r3,>Qc=)s_05m<Y(1/TTE[DX0@8*bnQ](>>q!Uq-KIIVioV*c)gKZ(*R-N^U\;b%.PK7HloaAn1XM>T<!m8idK5B4D[gehP51&5^W,BFsS9hX3p]*TYmYJ)uo"fXO)s3!NkQAS`?CJ@Cdn;4e/s:QqL\C0c6c<U4F,_Aa+@T;1O0F=W>k?/M*j2&EC_Q";h`N^7N\^CkA<*c)gKZ(*R-N^U\;ar^T73DulRNAY;+qUT9*1/WD'Z%^+7;<p4>8'@h0[<Kq)Wb4usMdU&n3nUr*fJj(F3G!"HM6OIS2`pcF8ZU(TRa^aOBg%!sZ:@]?UVW,8Z>=4dgJFAc\t#^BA,SI@\38J(#%KZ)C`J;9\!9^hAP`8CZuNJ^@U2Rj"9'&oCMPs_Ts<%KmJr2(of]O!Ha%Ju`cB5S3"j&G/('pB8#EUoea'`!.h*q]3[Lk/\FLFOPkfq)of]O!Ha%Ju`cB5S3"cO8X0I27gOkJq0U>YW`f\'V"u^?02NGUU:)P"[611q*'*GUN'Gnt/@,ptImd;F3dRp&BAKBF5,acKO&(ii_"^a.g_8[dPNVe6cj&,;W'+etb'%j])fJjoU?T%r$`[-1qqga[d;=J-1&8YSafXMIE3$&612?CY6-%V'QJ;rUZil-fY@k\6t'Z3JGE>u-%+0[Ib)mF<$Y]1bh0gH\^E>u-%+0[Ib)mF<$Y]1bh0gH[9g/ou3?iTuSGB\6]2oiq3^rDdpN?L4)2O:E0fs><#,+==IO,f7ap>$X'%+'_5)fJ\q2&R?O_'A)]>Cqh8g9AlBD,abKj7Qei!uh?L@ASrfWjopclbURF2?mh^h8\h^>[c[c?t09X"15nNE@2K&fQ]R3fYGK,D/a@I<Q,\2?I.Kb?@lT&A)Y&g^)QnNkmKD(fU.Z-:iV2Ko75R[!SA5uUGgt(`>(;V")e,A?t5"Pf_>u,pqq8)Y-;meE;M#UPE!o6cE7..o%%#`rTn/]g\S0^Cn(U[3!&D`/1Ngdk`3U$s8(?^[_>/7E=Nstj7p!jn^'c5'*T?<!&dRP2MTGl`]<P^gMd,T5Q;Vt-jg1u6fqe:*(VdB-X^H**,M,IfJioa(bu=8k5[D8!&fSU_8\KcN>$i%+`jl-%Ue<"?t77tCn(U[3!%YK1'\c]^s:6N_o'C=7o;7u(bu=8#Nt1/V!B@gQqKG'fGH@K)[GI'rr2]fpu()'l\=%O!SA5E#9*n94=l%<2U2tP%%2a-_fBg>K8oI*)aiaqj02qOCr+,Q3S6;BfJm*>0k:bP%a,VG^:V"(o&NB<irK6$6fqe:Y\[`XZ,GMU?DQT^!ujVi@,p1hkOVIAZ#L\d0k:bP*ZT!d#&F^9K8g*@)lE]U6fqe:_84-*^rDHrfQ_A>E>l&9A.CL=S0*4TiRtPM6Q\bm?t77tCcj[Y='(04LI3.Pq-[^R*,I_sfJj=KD>_L'T0._Io>V_f"M@.-n_dg81^(1jW;)9(^1_Bkb3&Ti^OPk"2]i3odf:<t%Q7'L-l\pj:_c3ErYujn"u]4D&0%BR0GVbd2D,DSS;.#$7`F;cp_k(fLV3ZX.1CV=jjV\uW#.W3?Xr-U^rC*P@q/IHFVS7nj1O()#G\PD)Rd(/.Ya3<^;e/1F*`0/o]ai->@HPKChI6W%-pl?NK&!j2Ob^/+(O>Ifttb-(`HA$NK&#@rr-7'@cM:hC1C3ObppHI`d*2rZ_`kF;))ldnMN5MRk8ISHpNEqJQHN'j7hG\5OE7lO<]f.5AjLV2U3:YS1X,FI!Bm\F`fS6n\W(tBq):ACn*N<3*WUAF93DBSXZ+<Y+&hZ1gjhW"?)hofJj>m(cm5--O;V*"#bm/@,hQFNRNE;TbH('K('AJ!?4BRYjhkT,=hnpL/).:$,T2o#&F^=^r@%@O!"na(cm5--O:e[)R?[=q>'icK=n9e\@fIr928jUp@d'<an!Qqahbg0Cc5LAj=BQ;??EV+Be\>a'`p:b+FF<+aNDM3`J]Y4Rg$*jP-hW+:+>_)l]da5@\(,2Ke/_:Z?TB=P%FITm;?2Mfo&%tjR0\j;LaT0S]1gkSfiC`BunQ=Y0FncY'Wq[M"+`RH?,;e1n^+SpLkkIQ;uf0f%%%CE"?PET?Blc^#c(kYW<CllaOtO-U&`YnH:".R>.5K/5`Gu>?M^HMXK8][;KK6FZ3'TdSRso_^\4,/NX]nRr8fQ*&#ZRo&e#FHs^QQUK"Jf"Mr)laN_^G[RXK)i7?<geZ5)F&Z1F_[Fr3rL,toc2.rYa/6nMSqmAqpmsUZ>#r\@tfJj>Nfi[jcQ^=&-dBusiSa+NPb"F=1D/<>V=5E1UW8lQ5pLmnFU)F?c?1DB6Cg8mN3"<FOfPIGbphP2aHI]S>PZeQ*A[XlL=>s`_4b-k\\iOsQMu7K5]L0ZXfXPb%E>l-jEOCUX211Z3fc/dUq:g&&?d7f;HeDZEZa"s4W4+A5N/b+4FMPn1aNDNZ#VcpaN]O5%<=hBqW#L'K[!tdT`RRuD:ra'`)V8Y-X6GbVLMG"9XZfFi,d;:fa?+P^Phk0OGM[TmCn"^mPBqIu)#C@o93*s2J`Sq=enJKnCp7pYaSUH%P]+>82Je"MnDq\)Ok%fsD-Vt-0n]]Lk>0b)583bap9680"rD*G5M14V?t8C'2U3C\4ArC<F93EE%lPIXfGHZ#N>$AVG1Lg2_=$`/f1fd/6_EQHYVA$?%r@aQ<Fs\=$7btI:NQ]k(`S)42GQqtqbGkc`]8R/TbH'<1"]UE`n2+jY]4-VZ%@t?0mI*d`*d'Y)e3CI^rD5I`X4UFgr9j8%pse]j`B(-]Luu$<5HS2_8Zg?*o+c@8,3jR<o"%CG:Ce7K8gOsN>69"K8oK;:3%K1Vh9sBK8gU^N/bjZ2D,_\XC,OS4;P/@WF03>)e7p5J;m2j52#o5rD&POCfc,M'AWXH%W5deXZCT"rUGqugnGVR`JYNUhO?6NNCu_.d&ut8D"67%.n+Z3It.;E;KBJoi!IQ_V.FjZ-.k2eNTE4cWn+<m*?E9#)reOK'A+.\;"+G/c&FRQe3Q]=$\GahLk4s6fc,D&&f\lqEJUB-6LJ)p*"QkU5@JEq`N(p*Wl<:P)Y3Imp/]>tDm]kNm5KE(6%<h/$FQa2^r?R:/d#nu7T^V%S=HN?e[btnF?p"@$'d.r0&.OKQ^Y4Rr"\a:Kkg/Tlr)g5o$V9!'#qrD\.#Sr(h%8tR"S`ah_1&pO`oh'<W:.HQs"JN<[)Bqg0%M!95JEPj"eEi?mLYiF[76\NIb*W;PK;Xr09SXQo/%_Zp`JS@h3B\#1scOW-RF7NN5M'X0JqlKWE&l$!">`\9SD88h4:Z(Mm=\fGKS>2O51^KrdSD(:ooBNNm%t"(Nc'2Qh[lb5`K6&aK>Hn]'F.A`Jc`J]G&IQ+[fY.06cVdbttQX=r](Hp22UZ%7nX!#pQQi%@Y52TEaH!?6ZBNCO=6/d#op.VEC,SL0m=G'A/BDBaEFqF!8mNFUV.-_k1%NCu]?flc/.:8mZ;51'gIj5;g:E7Q.Y6F1^(m]9`CMUQ-BH+gU*^rE46i01hm_b>p>34Os['(@r%LICF[)su_:_)_2bc/WY_PYR;B$N`4='l9sZj-"4p_^"iZ+@-dC=,0M]@,mM[j2>>8"WNe=@i_"E/S?`!AQbrOYA+70M0g8EY&ao\Xgp6[BKKC)$`f!QFfgnL[W3Q-NS>ec,F_3Bh0$+F,d38nef1fFNCsEo/(h?W)quniWaAIskgN#l=61mCdgGYD+!<U/58T%)j(EM0XHEo/Am9]N)6jGE/JB=XFfd`dM@/$gG+Hua2poWf_/4S]fjWo=_8Zg?0$2,%/f+>pqDD:<Jj(KVj_griT!`Mn(%-hLqBgT\VH`_o?NfYD4XARi7`$&Y>FTBlL9sO+NQVJE/(h?W)co\URFWpQ:b?O3ZXc7l])o>jLYJ&)'q/ue[@A8VEYl$SnZZeFHZEJ:D>=W0+&Kqrdf^U?fXNUSMfM6#p,b$E57MTc0/#0tT['pgK5@9-?16BXbcBHpB5`dIF^&da/'U1i4KR4GXe>:"C/ZU3fiAnG;h9q+#rYhgEFCb+2ql1s)NO*aXnGXh5>*k,/C].T9NUJ3Y*r\DqX0J]CJq+%GLb^=5jRW;I6Vko=06;ZVHo28a&d2l%Q5pSCoh%)_JEI2fXOnbZ%@t?nQ<THV';Purr.AE8LLsI5P0eM!#l0PnUOD)QOPi*'tH\9:,cV&qqlO[r'cC#KA2brK-Gl+_-faWOi!'GAUocV^r@T&)j^R`"p5g*PVtE`4[&c"ms^%OEs<S9JW31B7N6jUp"(:6o[1Ro"#eFBC^c'2s..//CucDIpr.0#o:)t$G%G<!kO.bUkdNH&br.Hp=+Td`C`J9ST2$?0EW3UqnY5?:MIrGBH1K:2r\JA[?(&PpW<O<R.^$!qhI'iL`tYf^3O$fKSr,%7S2](;idm*<YgUO6'j'$IDm1t7!un/3DW@!3Y-;p&?t4ut2GSm;j)liSY]8N-@u(@J:4m?B"r14uCs8*j0u1d?%r@a?ZZ3=/X$HD@ZN`i")ac`lE>m?H)c^,h]\d"tQr111A_["OcTb2g]G2E,(iMM?j@t+$q!gfg=4fKN$F]K^rq<gcc[8$LSXl<ac^kSo']nrCHggpu=23IfiX-Xf9sRPB]o?H>aAh4)2U31V%.V-Q\M9>.\*1d=_IoKhp?+[?H&u<MJ\4Y.(a=NjF(5b#5<M&Uq;mrqq!I+&5Mk;T+(Wu-+R`3tFAm[nnH?\J\M8o"#@s9!O_b.>:Cq?4)qYuWCck:nEGf/oW*7hUJ%'4W_h=+Zj4qGi:i3MCW;,&PBAC%OJW4^Q)ai.h@oQ\_fJkgo0i[IUN/@uI)s7D`L2)^-;/t8sj4qGi:p%#X.P;cYS/^)tWg\oEnJ&dY\Ufa6HI^$6G`9jYZ`]d*j4qGi:cUF'`M;Jep/Y/jo]ai-)e.j_^rB2&D2a@maRSfj`Pi!=/c]\re\]>)Ggp-]!l2fP/SpB'7h%@/J>8m77kf4;r8Sl?@u_ID%&...
[truncated message content] |
|
From: <sdt...@us...> - 2007-02-15 06:44:18
|
Revision: 53
http://svn.sourceforge.net/rapc/?rev=53&view=rev
Author: sdteffen
Date: 2007-02-14 22:44:12 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
Files downloaded from rapc.sourceforge.net
Added Paths:
-----------
trunk/htdocs/dcmms.css
trunk/htdocs/doc/
trunk/htdocs/doc/administrator/
trunk/htdocs/doc/administrator/RAPC_administration_guide.chm
trunk/htdocs/doc/administrator/RAPC_administration_guide.pdf
trunk/htdocs/doc/administrator/index.html
trunk/htdocs/doc/user/
trunk/htdocs/doc/user/ar/
trunk/htdocs/doc/user/en/
trunk/htdocs/doc/user/en/RAPC_user_guide.chm
trunk/htdocs/doc/user/en/RAPC_user_guide.pdf
trunk/htdocs/doc/user/en/images/
trunk/htdocs/doc/user/en/images/Thumbs.db
trunk/htdocs/doc/user/en/images/_svn/
trunk/htdocs/doc/user/en/images/_svn/README.txt
trunk/htdocs/doc/user/en/images/_svn/dir-wcprops
trunk/htdocs/doc/user/en/images/_svn/empty-file
trunk/htdocs/doc/user/en/images/_svn/entries
trunk/htdocs/doc/user/en/images/_svn/format
trunk/htdocs/doc/user/en/images/_svn/prop-base/
trunk/htdocs/doc/user/en/images/_svn/prop-base/Thumbs.db.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/blank.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/caution.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/draft.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/example.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/home.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/important.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/next.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/note.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/prev.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/tip.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/toc-blank.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/toc-minus.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/toc-plus.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/prop-base/up.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/props/
trunk/htdocs/doc/user/en/images/_svn/props/Thumbs.db.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/blank.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/caution.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/draft.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/example.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/home.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/important.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/next.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/note.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/prev.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/tip.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/toc-blank.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/toc-minus.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/toc-plus.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/props/up.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/text-base/
trunk/htdocs/doc/user/en/images/_svn/text-base/Thumbs.db.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/blank.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/caution.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/caution.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/draft.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/example.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/home.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/home.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/important.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/important.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/next.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/next.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/note.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/note.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/prev.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/prev.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/tip.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/tip.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/toc-blank.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/toc-minus.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/toc-plus.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/up.png.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/up.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/text-base/warning.svg.svn-base
trunk/htdocs/doc/user/en/images/_svn/tmp/
trunk/htdocs/doc/user/en/images/_svn/tmp/prop-base/
trunk/htdocs/doc/user/en/images/_svn/tmp/props/
trunk/htdocs/doc/user/en/images/_svn/tmp/text-base/
trunk/htdocs/doc/user/en/images/_svn/tmp/wcprops/
trunk/htdocs/doc/user/en/images/_svn/wcprops/
trunk/htdocs/doc/user/en/images/_svn/wcprops/Thumbs.db.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/blank.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/caution.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/caution.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/draft.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/example.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/home.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/home.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/important.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/important.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/next.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/next.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/note.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/note.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/prev.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/prev.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/tip.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/tip.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/toc-blank.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/toc-minus.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/toc-plus.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/up.png.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/up.svg.svn-work
trunk/htdocs/doc/user/en/images/_svn/wcprops/warning.svg.svn-work
trunk/htdocs/doc/user/en/images/blank.png
trunk/htdocs/doc/user/en/images/callouts/
trunk/htdocs/doc/user/en/images/callouts/1.png
trunk/htdocs/doc/user/en/images/callouts/10.png
trunk/htdocs/doc/user/en/images/callouts/11.png
trunk/htdocs/doc/user/en/images/callouts/12.png
trunk/htdocs/doc/user/en/images/callouts/13.png
trunk/htdocs/doc/user/en/images/callouts/14.png
trunk/htdocs/doc/user/en/images/callouts/15.png
trunk/htdocs/doc/user/en/images/callouts/2.png
trunk/htdocs/doc/user/en/images/callouts/3.png
trunk/htdocs/doc/user/en/images/callouts/4.png
trunk/htdocs/doc/user/en/images/callouts/5.png
trunk/htdocs/doc/user/en/images/callouts/6.png
trunk/htdocs/doc/user/en/images/callouts/7.png
trunk/htdocs/doc/user/en/images/callouts/8.png
trunk/htdocs/doc/user/en/images/callouts/9.png
trunk/htdocs/doc/user/en/images/callouts/_svn/
trunk/htdocs/doc/user/en/images/callouts/_svn/README.txt
trunk/htdocs/doc/user/en/images/callouts/_svn/dir-wcprops
trunk/htdocs/doc/user/en/images/callouts/_svn/empty-file
trunk/htdocs/doc/user/en/images/callouts/_svn/entries
trunk/htdocs/doc/user/en/images/callouts/_svn/format
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/1.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/10.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/11.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/12.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/13.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/14.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/15.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/2.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/3.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/4.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/5.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/6.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/7.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/8.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/prop-base/9.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/props/
trunk/htdocs/doc/user/en/images/callouts/_svn/props/1.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/10.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/11.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/12.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/13.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/14.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/15.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/2.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/3.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/4.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/5.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/6.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/7.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/8.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/props/9.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/1.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/10.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/11.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/12.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/13.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/14.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/15.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/2.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/3.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/4.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/5.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/6.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/7.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/8.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/text-base/9.png.svn-base
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/prop-base/
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/props/
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/text-base/
trunk/htdocs/doc/user/en/images/callouts/_svn/tmp/wcprops/
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/1.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/10.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/11.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/12.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/13.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/14.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/15.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/2.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/3.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/4.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/5.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/6.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/7.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/8.png.svn-work
trunk/htdocs/doc/user/en/images/callouts/_svn/wcprops/9.png.svn-work
trunk/htdocs/doc/user/en/images/caution.png
trunk/htdocs/doc/user/en/images/caution.svg
trunk/htdocs/doc/user/en/images/draft.png
trunk/htdocs/doc/user/en/images/example.png
trunk/htdocs/doc/user/en/images/home.png
trunk/htdocs/doc/user/en/images/home.svg
trunk/htdocs/doc/user/en/images/important.png
trunk/htdocs/doc/user/en/images/important.svg
trunk/htdocs/doc/user/en/images/next.png
trunk/htdocs/doc/user/en/images/next.svg
trunk/htdocs/doc/user/en/images/note.png
trunk/htdocs/doc/user/en/images/note.svg
trunk/htdocs/doc/user/en/images/prev.png
trunk/htdocs/doc/user/en/images/prev.svg
trunk/htdocs/doc/user/en/images/tip.png
trunk/htdocs/doc/user/en/images/tip.svg
trunk/htdocs/doc/user/en/images/toc-blank.png
trunk/htdocs/doc/user/en/images/toc-minus.png
trunk/htdocs/doc/user/en/images/toc-plus.png
trunk/htdocs/doc/user/en/images/up.png
trunk/htdocs/doc/user/en/images/up.svg
trunk/htdocs/doc/user/en/images/warning.svg
trunk/htdocs/doc/user/en/index.html
trunk/htdocs/etc/
trunk/htdocs/etc/rapc_flyer.pdf
trunk/htdocs/extlib/
trunk/htdocs/extlib/Snoopy.class.inc
trunk/htdocs/images/
trunk/htdocs/images/mpwh.PNG
trunk/htdocs/images/rapc_dataentry.png
trunk/htdocs/images/rapc_index.png
trunk/htdocs/images/rapc_map.png
trunk/htdocs/index.php
trunk/htdocs/rss.php
trunk/htdocs/rss_cache.inc
trunk/htdocs/rss_fetch.inc
trunk/htdocs/rss_parse.inc
trunk/htdocs/rss_utils.inc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-02-14 05:27:50
|
Revision: 52
http://svn.sourceforge.net/rapc/?rev=52&view=rev
Author: maher_karim
Date: 2007-02-13 21:27:46 -0800 (Tue, 13 Feb 2007)
Log Message:
-----------
2006-09-13 Maher Abdel karim <mah...@do...>
* Authorized_panel_report.php:
* contract_panel_report.php:
* detailed_panelinstallation_report.php:
* illegal_panelinstallation_report.php:
* panelinstallation_report.php:
* paneltypes_report.php:Adjust reports based on MPWH request.
* panelpage.php:display panel id after save.
* conf/dccssconfig.php
* conf/dccssconfig.php.default:add new variable to handle oracle
user name, and password.
* script/create_views.sql:Adjust view for reporting.
* query.php:add search by panelid, and filter based on username.
* doc/user/en/rapc_user_guide.xml:update user guide.
Modified Paths:
--------------
trunk/rapc/authorized_panel_report.php
trunk/rapc/changelog
trunk/rapc/conf/dccssconfig.php
trunk/rapc/conf/dccssconfig.php.default
trunk/rapc/contract_panel_report.php
trunk/rapc/doc/user/en/rapc_user_guide.xml
trunk/rapc/illegal_panelinstallation_report.php
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
trunk/rapc/paneltypes_report.php
trunk/rapc/query.php
trunk/rapc/script/create_views.sql
Modified: trunk/rapc/authorized_panel_report.php
===================================================================
--- trunk/rapc/authorized_panel_report.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/authorized_panel_report.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -26,7 +26,7 @@
// This require for quick form building.
require_once("HTML/QuickForm.php");
-$DccssPage = new RolPage(_("Panel installation report"));
+$DccssPage = new RolPage(_("Authorized Panel installation report-Governorates"));
//print_r($_POST);
$Queryform = new HTML_QuickForm('printForm');
@@ -36,7 +36,7 @@
// Add some elements to the form
$Queryform->addElement('header', null, _('Panel Installation'));
// fill the array with district information.
-$link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], "mpw_ris", "mpw_ris")
+$link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], $_SESSION['strOracleUser'], $_SESSION["strOraclePassword"])
or die("Could not connect to Oracle");
$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
@@ -58,13 +58,17 @@
$Queryform->addElement('submit', null, _('Search The Database'));
$DccssPage->add($Queryform->tohtml());
-$strWhere ='';
+if (strtolower($_SESSION['UserName'])!='admin'){
+$strWhere =" where panel.username='".$_SESSION['UserName']."' and contractno='' ";
+} else {
+$strWhere =" where contractno='' ";
+}
//print_r($_POST['district']);
if (($_POST['district']!='') && ($_POST['district']!='0')){
- $strWhere = $strWhere."where panel.district='".$Queryform->exportvalue('district')."'";
+ $strWhere = $strWhere." and panel.district='".$Queryform->exportvalue('district')."'";
} else {
- $strWhere = $strWhere."where panel.district<>''";
+ $strWhere = $strWhere." and panel.district<>''";
}
if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['m']!=0)&&($_POST['fromdate']['Y']!=0)) {
$strWhere = $strWhere . " and date >=to_date('".$_POST['fromdate']['Y']."-".
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/changelog 2007-02-14 05:27:46 UTC (rev 52)
@@ -1,3 +1,19 @@
+2006-09-13 Maher Abdel karim <mah...@do...>
+
+ * Authorized_panel_report.php:
+ * contract_panel_report.php:
+ * detailed_panelinstallation_report.php:
+ * illegal_panelinstallation_report.php:
+ * panelinstallation_report.php:
+ * paneltypes_report.php:Adjust reports based on MPWH request.
+ * panelpage.php:display panel id after save.
+ * conf/dccssconfig.php
+ * conf/dccssconfig.php.default:add new variable to handle oracle
+ user name, and password.
+ * script/create_views.sql:Adjust view for reporting.
+ * query.php:add search by panelid, and filter based on username.
+ * doc/user/en/rapc_user_guide.xml:update user guide.
+
2006-09-11 Maher Abdel karim <mah...@do...>
* include/i18n.php:
Modified: trunk/rapc/conf/dccssconfig.php
===================================================================
--- trunk/rapc/conf/dccssconfig.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/conf/dccssconfig.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -122,4 +122,9 @@
//Directory to save loaded images
$_SESSION['imagedir']="c:/program files/mpwh/rapc/data/plugin/";
+/**
+Oracle username and password
+**/
+$_SESSION['strOracleUser']='mpw_ris';
+$_SESSION["strOraclePassword"]='mpw_ris';
?>
Modified: trunk/rapc/conf/dccssconfig.php.default
===================================================================
--- trunk/rapc/conf/dccssconfig.php.default 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/conf/dccssconfig.php.default 2007-02-14 05:27:46 UTC (rev 52)
@@ -120,4 +120,9 @@
$_SESSION['textdomain']='rapc';
//Directory to save loaded images
$_SESSION['imagedir']="c:/program files/rapc/data/plugin/";
+/**
+Oracle username and password
+**/
+$_SESSION['strOracleUser']='mpw_ris';
+$_SESSION["strOraclePassword"]='mpw_ris';
?>
Modified: trunk/rapc/contract_panel_report.php
===================================================================
--- trunk/rapc/contract_panel_report.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/contract_panel_report.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -58,13 +58,17 @@
$Queryform->addElement('submit', null, _('Search The Database'));
$DccssPage->add($Queryform->tohtml());
-$strWhere ='';
+if (strtolower($_SESSION['UserName'])!='admin'){
+$strWhere =" where panel.username='".$_SESSION['UserName']."'";
+} else {
+ $strWhere =" where panel.username<>''";
+}
//print_r($_POST['district']);
if ($_POST['district']!='0'){
- $strWhere = $strWhere."where contractno<>'' and panel.district='".$Queryform->exportvalue('district')."'";
+ $strWhere = $strWhere." and contractno<>'' and panel.district='".$Queryform->exportvalue('district')."'";
} else {
- $strWhere = $strWhere."where panel.district<>'' and contractno<>'' ";
+ $strWhere = $strWhere." and panel.district<>'' and contractno<>'' ";
}
if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['m']!=0)&&($_POST['fromdate']['Y']!=0)) {
$strWhere = $strWhere . " and date >=to_date('".$_POST['fromdate']['Y']."-".
Modified: trunk/rapc/doc/user/en/rapc_user_guide.xml
===================================================================
--- trunk/rapc/doc/user/en/rapc_user_guide.xml 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/doc/user/en/rapc_user_guide.xml 2007-02-14 05:27:46 UTC (rev 52)
@@ -43,8 +43,8 @@
- <sect3 id="news_0_0_1">
- <title>Version 0.0.1</title>
+ <sect3 id="news_0_5_0">
+ <title>Version 0.5.0</title>
<para><orderedlist>
<listitem>
<para>Query: This functionality allows the user to query the panel
@@ -535,7 +535,7 @@
<listitem>
<para>The RAPC version. The version number can be found in the
top line of the application, along with the main menu link.
- Example: RAPC 0.0.1</para>
+ Example: RAPC 0.5.0</para>
</listitem>
<listitem>
Modified: trunk/rapc/illegal_panelinstallation_report.php
===================================================================
--- trunk/rapc/illegal_panelinstallation_report.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/illegal_panelinstallation_report.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -36,7 +36,7 @@
// Add some elements to the form
$Queryform->addElement('header', null, _('Panel Installation'));
// fill the array with district information.
-$link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], "mpw_ris", "mpw_ris")
+$link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], $_SESSION['strOracleUser'], $_SESSION["strOraclePassword"])
or die("Could not connect to Oracle");
$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
@@ -58,14 +58,18 @@
$Queryform->addElement('submit', null, _('Search The Database'));
$DccssPage->add($Queryform->tohtml());
-$strWhere ='';
+if (strtolower($_SESSION['UserName'])!='admin'){
+$strWhere =" where panelinformation.username='".$_SESSION['UserName']."'";
+} else {
+$strWhere =" where panelinformation.username<>''";
+}
//print_r($_POST['district']);
if ($_POST['district']!=''){
- $strWhere = $strWhere."where panelinformation.district='".
+ $strWhere = $strWhere." and panelinformation.district='".
$Queryform->exportvalue('district')."' and panelinformation.notes like '%مخالف%' ";
} else {
- $strWhere = $strWhere."where panelinformation.district<>'' and panelinformation.notes like '%مخالف%' ";
+ $strWhere = $strWhere." and panelinformation.district<>'' and panelinformation.notes like '%مخالف%' ";
}
if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['m']!=0)&&($_POST['fromdate']['Y']!=0)) {
$strWhere = $strWhere . " and date >=to_date('".$_POST['fromdate']['Y']."-".
Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/include/dataobject/Public_panel.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -250,7 +250,7 @@
$form->addRule('mobileno', _('The Entered Mobile no should 10 letters max.'),
'maxlength',10,'client');
$form->addRule('pobox', _('The Entered pobox value should 6 letters max.'),
- 'maxlength',6,'client');
+ 'maxlength',32,'client');
$form->addRule('panelsubject', _('The Entered Panel subject value should 32 letters max.'),
'maxlength',125,'client');
$form->addRule('numberoflanes', _('The entered number of lanesvalue should be between 1 and 8.'),
Modified: trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-02-14 05:27:46 UTC (rev 52)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: mpwh\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-02-11 11:14+0200\n"
+"PO-Revision-Date: 2007-02-13 08:06+0200\n"
"Last-Translator: t <t>\n"
"Language-Team: dc <mah...@do...>\n"
"MIME-Version: 1.0\n"
@@ -119,9 +119,8 @@
msgstr "لم تتم المعالجة"
#: ../../../authorized_panel_report.php:29
-#: ../../../panelinstallation_report.php:29
-msgid "Panel installation report"
-msgstr "تقرير اللوحات الاعلانية المرخصة"
+msgid "Authorized Panel installation report-Governorates"
+msgstr "اللوحات الاعلانية المرخصة-المحافظات"
#: ../../../authorized_panel_report.php:37
#: ../../../contract_panel_report.php:37
@@ -185,7 +184,7 @@
#: ../../../authorized_panel_report.php:58
#: ../../../contract_panel_report.php:58
-#: ../../../detailed_panelinstallation_report.php:58
+#: ../../../detailed_panelinstallation_report.php:61
#: ../../../illegal_panelinstallation_report.php:58
#: ../../../panelinstallation_report.php:58
#: ../../../query.php:110
@@ -203,14 +202,14 @@
msgstr "مديرية السلامة المرورية - قسم التعديات"
#: ../../../authorized_panel_report.php:96
-#: ../../../detailed_panelinstallation_report.php:90
+#: ../../../detailed_panelinstallation_report.php:99
#: ../../../panelinstallation_report.php:115
msgid "Authorized panel list from:"
msgstr "قائمة اللوحات المرخصة من:"
#: ../../../authorized_panel_report.php:98
#: ../../../contract_panel_report.php:101
-#: ../../../detailed_panelinstallation_report.php:92
+#: ../../../detailed_panelinstallation_report.php:101
#: ../../../illegal_panelinstallation_report.php:119
#: ../../../panelinstallation_report.php:117
msgid " To:"
@@ -218,7 +217,7 @@
#: ../../../authorized_panel_report.php:99
#: ../../../contract_panel_report.php:102
-#: ../../../detailed_panelinstallation_report.php:93
+#: ../../../detailed_panelinstallation_report.php:102
#: ../../../illegal_panelinstallation_report.php:120
#: ../../../panelinstallation_report.php:118
msgid "District:"
@@ -244,6 +243,15 @@
msgid "Detailed Panel installation report"
msgstr "تقرير اللوحات الاعلانية المركبة المفصل"
+#: ../../../detailed_panelinstallation_report.php:58
+#: ../../../query.php:56
+msgid "Company Name"
+msgstr "اسم الجهة الطالبة"
+
+#: ../../../detailed_panelinstallation_report.php:59
+msgid "Receipt number"
+msgstr "رقم الوصل المالي"
+
#: ../../../illegal_panelinstallation_report.php:29
msgid "Illegal Panel installation report"
msgstr "تقرير اللوحات الاعلانية المخالفة"
@@ -419,6 +427,7 @@
#: ../../../mainpage.php:148
#: ../../../panelpage.php:150
+#: ../../../panelpage.php:231
msgid "Panel #"
msgstr "رقم اللوحة"
@@ -586,6 +595,10 @@
msgid "Identify"
msgstr "تعريف"
+#: ../../../panelinstallation_report.php:29
+msgid "Panel installation report"
+msgstr "تقرير اللوحات الاعلانية المرخصة"
+
#: ../../../panelinstallation_report.php:110
msgid "Unkown"
msgstr "غير محدد"
@@ -672,9 +685,9 @@
msgid "Select Date:"
msgstr "اختر تاريخ:"
-#: ../../../query.php:56
-msgid "Company Name"
-msgstr "اسم الجهة الطالبة"
+#: ../../../query.php:57
+msgid "Panel ID"
+msgstr "رقم اللوحة"
#: ../../../query.php:116
#: ../../../admin/setup.php:61
@@ -682,7 +695,7 @@
msgid "denotes required field"
msgstr "ادخل معلومات الحقول المطلوبة"
-#: ../../../query.php:185
+#: ../../../query.php:192
msgid "Back to Panel"
msgstr "العودة الى اللوحة"
@@ -1067,7 +1080,7 @@
#: ../../../admin/user_management.php:306
#: ../../../include/header.php:430
#: ../../../include/i18n.php:24
-#: ../../../include/dataobject/Public_panel.php:796
+#: ../../../include/dataobject/Public_panel.php:800
msgid "Action"
msgstr "الاجراء"
@@ -1268,8 +1281,8 @@
#: ../../../include/i18n.php:25
#: ../../../include/i18n.php:83
-#: ../../../include/dataobject/Public_panel.php:683
-#: ../../../include/dataobject/Public_panel.php:745
+#: ../../../include/dataobject/Public_panel.php:687
+#: ../../../include/dataobject/Public_panel.php:749
msgid "No"
msgstr "لا"
@@ -1278,8 +1291,8 @@
msgstr "غير معروف"
#: ../../../include/i18n.php:27
-#: ../../../include/dataobject/Public_panel.php:683
-#: ../../../include/dataobject/Public_panel.php:745
+#: ../../../include/dataobject/Public_panel.php:687
+#: ../../../include/dataobject/Public_panel.php:749
msgid "Yes"
msgstr "نعم"
@@ -1314,7 +1327,7 @@
#: ../../../include/i18n.php:35
msgid "Totalfees"
-msgstr "مجموع الرسوم"
+msgstr "مجموع المبالغ المحصلة"
#: ../../../include/i18n.php:36
msgid "Usefees"
@@ -1783,8 +1796,8 @@
msgstr "يوجد جزيرة:"
#: ../../../include/dataobject/Public_panel.php:347
-#: ../../../include/dataobject/Public_panel.php:710
-#: ../../../include/dataobject/Public_panel.php:728
+#: ../../../include/dataobject/Public_panel.php:714
+#: ../../../include/dataobject/Public_panel.php:732
msgid "Date"
msgstr "التاريخ:"
@@ -1825,7 +1838,7 @@
msgstr "نوع اللوحة و ابعادها:"
#: ../../../include/dataobject/Public_panel.php:354
-#: ../../../include/dataobject/Public_panel.php:715
+#: ../../../include/dataobject/Public_panel.php:719
msgid "Panel Area"
msgstr "مساحة اللوحة:"
@@ -1874,7 +1887,7 @@
msgstr "رقم الترخيص:"
#: ../../../include/dataobject/Public_panel.php:361
-#: ../../../include/dataobject/Public_panel.php:733
+#: ../../../include/dataobject/Public_panel.php:737
msgid "Registeration No.:"
msgstr "رقم التسجيل:"
@@ -1912,98 +1925,98 @@
msgid "%s: This field is required."
msgstr "%s: يجب ادخال هذا الحقل."
-#: ../../../include/dataobject/Public_panel.php:598
+#: ../../../include/dataobject/Public_panel.php:602
msgid "Select One"
msgstr "اختر واحد"
-#: ../../../include/dataobject/Public_panel.php:676
+#: ../../../include/dataobject/Public_panel.php:680
msgid "Contract"
msgstr "عطاء"
-#: ../../../include/dataobject/Public_panel.php:676
+#: ../../../include/dataobject/Public_panel.php:680
msgid "Private"
msgstr "قطاع خاص"
-#: ../../../include/dataobject/Public_panel.php:676
+#: ../../../include/dataobject/Public_panel.php:680
msgid "Goverment"
msgstr "حكومي"
-#: ../../../include/dataobject/Public_panel.php:682
+#: ../../../include/dataobject/Public_panel.php:686
msgid "Panel catagory"
msgstr "فئة اللوحة"
-#: ../../../include/dataobject/Public_panel.php:690
+#: ../../../include/dataobject/Public_panel.php:694
msgid "Median available"
msgstr "يوجد جزيرة"
-#: ../../../include/dataobject/Public_panel.php:692
+#: ../../../include/dataobject/Public_panel.php:696
msgid "Panel image"
msgstr "صورة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:697
+#: ../../../include/dataobject/Public_panel.php:701
msgid "Panel Area:"
msgstr "مساحة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:699
-#: ../../../include/dataobject/Public_panel.php:717
+#: ../../../include/dataobject/Public_panel.php:703
+#: ../../../include/dataobject/Public_panel.php:721
msgid "Use fees"
msgstr "بدل استغلال حرم الطريق"
-#: ../../../include/dataobject/Public_panel.php:701
-#: ../../../include/dataobject/Public_panel.php:719
+#: ../../../include/dataobject/Public_panel.php:705
+#: ../../../include/dataobject/Public_panel.php:723
msgid "Annualfees"
msgstr "الرسوم السنوية:"
-#: ../../../include/dataobject/Public_panel.php:703
-#: ../../../include/dataobject/Public_panel.php:721
+#: ../../../include/dataobject/Public_panel.php:707
+#: ../../../include/dataobject/Public_panel.php:725
msgid "Total fees"
msgstr "المجموع"
-#: ../../../include/dataobject/Public_panel.php:739
+#: ../../../include/dataobject/Public_panel.php:743
msgid "Total fees:"
msgstr "مجموع الرسوم:"
-#: ../../../include/dataobject/Public_panel.php:745
+#: ../../../include/dataobject/Public_panel.php:749
msgid "Right of Way:"
msgstr "داخل الحرم:"
-#: ../../../include/dataobject/Public_panel.php:788
+#: ../../../include/dataobject/Public_panel.php:792
msgid "ID"
msgstr "رقم التعريف"
-#: ../../../include/dataobject/Public_panel.php:789
+#: ../../../include/dataobject/Public_panel.php:793
msgid "Company name"
msgstr "اسم الجهة الطالبة"
-#: ../../../include/dataobject/Public_panel.php:790
+#: ../../../include/dataobject/Public_panel.php:794
msgid "National number"
msgstr "الرقم الوطني:"
-#: ../../../include/dataobject/Public_panel.php:791
+#: ../../../include/dataobject/Public_panel.php:795
msgid "Mother name"
msgstr "اسم الام:"
-#: ../../../include/dataobject/Public_panel.php:792
+#: ../../../include/dataobject/Public_panel.php:796
msgid "Address"
msgstr "العنوان:"
-#: ../../../include/dataobject/Public_panel.php:793
+#: ../../../include/dataobject/Public_panel.php:797
msgid "Telephone no."
msgstr "رقم الهاتف:"
-#: ../../../include/dataobject/Public_panel.php:794
+#: ../../../include/dataobject/Public_panel.php:798
msgid "Fax no."
msgstr "رقم الفاكس:"
-#: ../../../include/dataobject/Public_panel.php:795
+#: ../../../include/dataobject/Public_panel.php:799
msgid "Mobile no."
msgstr "رقم المحمول:"
-#: ../../../include/dataobject/Public_panel.php:812
+#: ../../../include/dataobject/Public_panel.php:816
msgid "[View on Map]"
msgstr "[اظهار على الخريطة]"
-#: ../../../include/dataobject/Public_panel.php:818
+#: ../../../include/dataobject/Public_panel.php:822
msgid "[Edit]"
msgstr "[تحرير]"
Modified: trunk/rapc/panelinstallation_report.php
===================================================================
--- trunk/rapc/panelinstallation_report.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/panelinstallation_report.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -36,7 +36,7 @@
// Add some elements to the form
$Queryform->addElement('header', null, _('Panel Installation'));
// fill the array with district information.
-$link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], "mpw_ris", "mpw_ris")
+$link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], $_SESSION['strOracleUser'], $_SESSION["strOraclePassword"])
or die("Could not connect to Oracle");
$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
@@ -58,13 +58,17 @@
$Queryform->addElement('submit', null, _('Search The Database'));
$DccssPage->add($Queryform->tohtml());
-$strWhere ='';
+if (strtolower($_SESSION['UserName'])!='admin'){
+$strWhere =" where panelinformation.username='".$_SESSION['UserName']."'";
+} else {
+ $strWhere =" where panelinformation.username<>''";
+}
//print_r($_POST['district']);
if ($_POST['district']!=''){
- $strWhere = $strWhere."where panelinformation.district='".$Queryform->exportvalue('district')."'";
+ $strWhere = $strWhere." and panelinformation.district='".$Queryform->exportvalue('district')."'";
} else {
- $strWhere = $strWhere."where panelinformation.district<>''";
+ $strWhere = $strWhere." and panelinformation.district<>''";
}
if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['m']!=0)&&($_POST['fromdate']['Y']!=0)) {
$strWhere = $strWhere . " and date >=to_date('".$_POST['fromdate']['Y']."-".
Modified: trunk/rapc/panelpage.php
===================================================================
--- trunk/rapc/panelpage.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/panelpage.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -228,12 +228,12 @@
$dccssPage->addMessage(_('Image is loaded'));
$objPanel->image=''.$_SESSION['loadedimage'].'';
-
+ $dccssPage->add(_('Panel #').'<b> '.$objPanel->id .'</b><br>');
$objPanel->update();
$dccssPage->addMessage(_('Record(s) successfully saved.'));
-
+
$dccssPage->add('<a href="Panelpage.php?PHPSESSID='.session_id().
'&action=map&id='.$objPanel->id.'">'.
_('View on Map').'</a>');
Modified: trunk/rapc/paneltypes_report.php
===================================================================
--- trunk/rapc/paneltypes_report.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/paneltypes_report.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -39,14 +39,17 @@
$form->addElement('submit', 'btnSubmit', 'Submit');
$DccssPage->add($form->toHTML());
-
-$strWhere='';
+if (strtolower($_SESSION['UserName'])!='admin'){
+$strWhere =" where panel.username='".$_SESSION['UserName']."'";
+} else {
+ $strWhere =" where panel.username<>''";
+}
if (($form->exportValue('FromDate')!='')){
$strFromDate = $_POST['FromDate']['Y'].'/'.$_POST['FromDate']['m'].'/'.
$_POST['FromDate']['d']." 01:01";
$strToDate = $_POST['ToDate']['Y'].'/'.$_POST['ToDate']['m'].'/'.
$_POST['ToDate']['d']." 23:59";
- $strWhere = " where panel.date >='".$strFromDate.
+ $strWhere = $strWhere." and panel.date >='".$strFromDate.
"' and panel.date <= '".$strToDate."'";
$DccssPage->add(_("Panel installation on route for the period from".
Modified: trunk/rapc/query.php
===================================================================
--- trunk/rapc/query.php 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/query.php 2007-02-14 05:27:46 UTC (rev 52)
@@ -54,9 +54,9 @@
$Queryform->addElement('date', 'regdate', _('Select Date:'),array('maxYear'=>2020,
'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
$Queryform->addElement('text','companyname',_('Company Name'));
+$Queryform->addElement('text','panelid',_('Panel ID'));
-
$conditionalFields = array(
'road_route_district' => array(
'district:public.panel' => array('district'),
@@ -68,7 +68,7 @@
foreach ($conditionalFields as $virtualfield => $cf) {
$desc = $virtualfield;
-$link = dbx_connect(DBX_OCI8, "", "", "mpw_ris", "mpw_ris")
+$link = dbx_connect(DBX_OCI8, "", "", $_SESSION['strOracleUser'], $_SESSION["strOraclePassword"])
or die("Could not connect to Oracle");
$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
@@ -116,22 +116,26 @@
_('denotes required field').'</span>');
$RolPage->add($Queryform->toHTML());
$boolWhere = false;
-$strWhere='';
+if (strtolower($_SESSION['UserName'])!='admin'){
+$strWhere=" where panel.username='".$_SESSION['UserName']."'";
+} else {
+ $strWhere=" where panel.username<>''";
+}
if($Queryform->validate()) {
// print_r($_POST);
- if ($_POST['district']!=0){
+ if ($_POST['district']!='0'){
- $strWhere = " where district='".$_POST['district']."'";
+ $strWhere = $strWhere." and district='".$_POST['district']."'";
$boolWhere = true;
}
- if ($_POST['Queryroute'][1]!=0){
+ if ($_POST['Queryroute'][1]!='0'){
if ($boolWhere){
$strWhere = $strWhere." and district='".$_POST['Queryroute'][0]."' and roadname='".$_POST['Queryroute'][1].
"' and routename='".$_POST['Queryroute'][2]."'";
} else {
- $strWhere = $strWhere." where district='".$_POST['Queryroute'][0]."' and roadname='".$_POST['Queryroute'][1].
+ $strWhere = $strWhere." and district='".$_POST['Queryroute'][0]."' and roadname='".$_POST['Queryroute'][1].
"' and routename='".$_POST['Queryroute'][2]."'";
}
$boolWhere=true;
@@ -145,7 +149,7 @@
$_POST['regdate']['m']." and date_part('year',date)=".
$_POST['regdate']['Y'];
} else{
- $strWhere = $strWhere." where date_part('day',date)=".
+ $strWhere = $strWhere." and date_part('day',date)=".
$_POST['regdate']['d']." and date_part('month',date)=".
$_POST['regdate']['m']." and date_part('year',date)=".
$_POST['regdate']['Y'];
@@ -156,15 +160,22 @@
if ($boolWhere){
$strWhere = $strWhere." and companyname like '%".$Queryform->exportvalue('companyname')."%'";
}else{
- $strWhere = $strWhere." where companyname like '%".$Queryform->exportvalue('companyname')."%'";
+ $strWhere = $strWhere." and companyname like '%".$Queryform->exportvalue('companyname')."%'";
}
}
-
+if ($Queryform->exportvalue('panelid')!=''){
+
+ if ($boolWhere){
+ $strWhere = $strWhere." and panel.id=".$Queryform->exportvalue('panelid')."";
+ }else{
+ $strWhere = $strWhere." and panel.id=".$Queryform->exportvalue('panelid')."";
+ }
+ }
$strQuery="select id,companyname,nationalno , mothername , address ,teleno ,
faxno ,mobileno ,pobox , panelsubject , roadname ,routename ,carrigewaywidth ,
shoulderwidth ,numberoflanes ,medianwidth ,date ,x , y ,routetodistance ,
paneltodistance ,routedirection , notesonlocation from panel ".$strWhere;
- //print_r($strQuery);
+ // print_r($strQuery);
$objTable = DB_DataObject::factory('public.panel');
if(PEAR::isError($objTable)or(NULL == $objTable)) {
die(_($objTable->getMessage()));
Modified: trunk/rapc/script/create_views.sql
===================================================================
--- trunk/rapc/script/create_views.sql 2007-02-11 12:32:41 UTC (rev 51)
+++ trunk/rapc/script/create_views.sql 2007-02-14 05:27:46 UTC (rev 52)
@@ -32,7 +32,8 @@
panel.totalfees,panel.usefees,
panel.receiptno,panel.receiptdate,panel.insurancereceiptno,
panel.insurancereceiptdate,panel.notes,panel.verificationreceiptno,
- panel.verificationreceiptdate,panel.x,panel.y,panel.annualfees,panel.registerno
+ panel.verificationreceiptdate,panel.x,panel.y,panel.annualfees,panel.registerno,
+ panel.username
from panel left outer join typedimensionfees on
(panel.routetype=typedimensionfees.routetype and
panel.paneldimension=typedimensionfees.paneldimension)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-02-14 05:27:50
|
Revision: 52
http://svn.sourceforge.net/rapc/?rev=52&view=rev
Author: maher_karim
Date: 2007-02-13 21:27:46 -0800 (Tue, 13 Feb 2007)
Log Message:
-----------
2006-09-13 Maher Abdel karim <mah...@do...>
* Authorized_panel_report.php:
* contract_panel_report.php:
* detailed_panelinstallation_report.php:
* illegal_panelinstallation_report.php:
* panelinstallation_report.php:
* paneltypes_report.php:Adjust reports based on MPWH request.
* panelpage.php:display panel id after save.
* conf/dccssconfig.php
* conf/dccssconfig.php.default:add new variable to handle oracle
user name, and password.
* script/create_views.sql:Adjust view for reporting.
* query.php:add search by panelid, and filter based on username.
* doc/user/en/rapc_user_guide.xml:update user guide.
Modified Paths:
--------------
trunk/rapc/authorized_panel_report.php
trunk/rapc/changelog
trunk/rapc/conf/dccssconfig.php
trunk/rapc/conf/dccssconfig.php.default
trunk/rapc/contract_panel_report.php
trunk/rapc/doc/user/en/rapc_user_guide.xml
trunk/rapc/illegal_panelinstallation_report.php
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
trunk/rapc/paneltypes_report.php
trunk/rapc/query.php
trunk/rapc/script/create_views.sql
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-02-11 12:32:55
|
Revision: 51
http://svn.sourceforge.net/rapc/?rev=51&view=rev
Author: maher_karim
Date: 2007-02-11 04:32:41 -0800 (Sun, 11 Feb 2007)
Log Message:
-----------
2006-09-11 Maher Abdel karim <mah...@do...>
* include/i18n.php:
* ar/LC_MESSAGES/rapc.po:Adjust missing translation.
* include/dataobject/public_panel.php:Add new validation for boolrow.
* contract_panel_report.php:adjust the POST checking.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/contract_panel_report.php
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/i18n.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-02-08 07:14:21 UTC (rev 50)
+++ trunk/rapc/changelog 2007-02-11 12:32:41 UTC (rev 51)
@@ -1,3 +1,10 @@
+2006-09-11 Maher Abdel karim <mah...@do...>
+
+ * include/i18n.php:
+ * ar/LC_MESSAGES/rapc.po:Adjust missing translation.
+ * include/dataobject/public_panel.php:Add new validation for boolrow.
+ * contract_panel_report.php:adjust the POST checking.
+
2007-02-05 Maher Abdel karim <mah...@do...>
* doc/user/en/rapc_user_guide.xml:update user guide.
Modified: trunk/rapc/contract_panel_report.php
===================================================================
--- trunk/rapc/contract_panel_report.php 2007-02-08 07:14:21 UTC (rev 50)
+++ trunk/rapc/contract_panel_report.php 2007-02-11 12:32:41 UTC (rev 51)
@@ -36,7 +36,7 @@
// Add some elements to the form
$Queryform->addElement('header', null, _('Panel Installation'));
// fill the array with district information.
-$link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], "mpw_ris", "mpw_ris")
+$link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], $_SESSION["strOracleUser"], $_SESSION["strOraclePassword"])
or die("Could not connect to Oracle");
$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
@@ -60,34 +60,34 @@
$DccssPage->add($Queryform->tohtml());
$strWhere ='';
//print_r($_POST['district']);
-if ($_POST['district']!=''){
+if ($_POST['district']!='0'){
$strWhere = $strWhere."where contractno<>'' and panel.district='".$Queryform->exportvalue('district')."'";
-
+
} else {
$strWhere = $strWhere."where panel.district<>'' and contractno<>'' ";
}
if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['m']!=0)&&($_POST['fromdate']['Y']!=0)) {
$strWhere = $strWhere . " and date >=to_date('".$_POST['fromdate']['Y']."-".
$_POST['fromdate']['m']."-".$_POST['fromdate']['d']."','YYYY-MM-dd')";
-
-
+
+
} elseif (($_POST['todate']['d']!=0)&&($_POST['todate']['m']!=0)&&($_POST['todate']['Y']!=0)){
$strWhere = $strWhere . " and date <= to_date('".$_POST['todate']['Y']."-".
$_POST['todate']['m']."-".$_POST['todate']['d']."','YYYY-MM-dd')";
}
-
-$strQuery = "select contractno,count(CASE routetype WHEN 1 THEN 1 END) as
+
+$strQuery = "select contractno,count(CASE routetype WHEN 1 THEN 1 END) as
Main, count(CASE routetype WHEN 2 THEN 1 END) as Secondary,
count(CASE routetype WHEN 3 THEN 1 END) as Village,companyname,registerno,
paneldimension.description as dimension,
facecount,count(*) as totalpanels,sum(totalfees) as fees,
-sum(contractunitprice) as pedding, ((sum(totalfees)+ sum(contractunitprice))*count(*)) as total
+sum(contractunitprice) as pedding, ((sum(totalfees)+ sum(contractunitprice))) as total
-from panel left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension) ".$strWhere."
+from panel left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension) ".$strWhere."
group by contractno,companyname,registerno,paneldimension.description,facecount";
//print_r($strQuery);
Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php 2007-02-08 07:14:21 UTC (rev 50)
+++ trunk/rapc/include/dataobject/Public_panel.php 2007-02-11 12:32:41 UTC (rev 51)
@@ -4,54 +4,54 @@
*/
require_once 'DB/DataObject.php';
-class DataObject_Public_panel extends DB_DataObject
+class DataObject_Public_panel extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
var $__table = 'public.panel'; // table name
- var $id; // int4(4)
+ var $id; // int4(4)
var $district; // int4(4)
var $panelcatagory; // int4(4)
- var $companyname; // varchar(-1)
- var $nationalno; // varchar(-1)
- var $mothername; // varchar(-1)
- var $address; // varchar(-1)
- var $teleno; // varchar(-1)
- var $faxno; // varchar(-1)
- var $mobileno; // varchar(-1)
- var $pobox; // varchar(-1)
- var $panelsubject; // varchar(-1)
- var $roadname; // varchar(-1)
- var $routename; // varchar(-1)
- var $carrigewaywidth; // int4(4)
- var $shoulderwidth; // int4(4)
- var $numberoflanes; // int4(4)
- var $medianwidth; // int4(4)
- var $date; // date(4)
- var $x; // float4(4)
- var $y; // float4(4)
- var $routetodistance; // int4(4)
- var $paneltodistance; // int4(4)
- var $routedirection; // int4(4)
- var $notesonlocation; // varchar(-1)
- var $nearstpanelx; // float4(4)
- var $nearstpanely; // float4(4)
- var $lightavailable; // int4(4)
- var $facecount; // int4(4)
- var $routetype; // int4(4)
- var $paneltype; // int4(4)
- var $paneldimension; // int4(4)
- var $panelarea; // int4(4)
- var $annualfees; // float4(4)
- var $usefees; // float4(4)
- var $totalfees; // float4(4)
- var $agreedby; // varchar(-1)
- var $receiptno; // varchar(-1)
- var $receiptdate; // date(4)
- var $contractno; // varchar(-1)
- var $notes; // varchar(-1)
- var $the_geom; // geometry(-1)
+ var $companyname; // varchar(-1)
+ var $nationalno; // varchar(-1)
+ var $mothername; // varchar(-1)
+ var $address; // varchar(-1)
+ var $teleno; // varchar(-1)
+ var $faxno; // varchar(-1)
+ var $mobileno; // varchar(-1)
+ var $pobox; // varchar(-1)
+ var $panelsubject; // varchar(-1)
+ var $roadname; // varchar(-1)
+ var $routename; // varchar(-1)
+ var $carrigewaywidth; // int4(4)
+ var $shoulderwidth; // int4(4)
+ var $numberoflanes; // int4(4)
+ var $medianwidth; // int4(4)
+ var $date; // date(4)
+ var $x; // float4(4)
+ var $y; // float4(4)
+ var $routetodistance; // int4(4)
+ var $paneltodistance; // int4(4)
+ var $routedirection; // int4(4)
+ var $notesonlocation; // varchar(-1)
+ var $nearstpanelx; // float4(4)
+ var $nearstpanely; // float4(4)
+ var $lightavailable; // int4(4)
+ var $facecount; // int4(4)
+ var $routetype; // int4(4)
+ var $paneltype; // int4(4)
+ var $paneldimension; // int4(4)
+ var $panelarea; // int4(4)
+ var $annualfees; // float4(4)
+ var $usefees; // float4(4)
+ var $totalfees; // float4(4)
+ var $agreedby; // varchar(-1)
+ var $receiptno; // varchar(-1)
+ var $receiptdate; // date(4)
+ var $contractno; // varchar(-1)
+ var $notes; // varchar(-1)
+ var $the_geom; // geometry(-1)
var $insurancereceiptno;
var $ownership;
var $insurancereceiptdate;
@@ -65,7 +65,7 @@
var $verificationreceiptno;
var $verificationreceiptdate;
var $verificationamount;
-
+
/* ZE2 compatibility trick*/
function __clone() { return $this;}
@@ -76,20 +76,20 @@
###END_AUTOCODE
function table() {
//return array_merge(parent::table(), array('x' => 0, 'y' => 0));
- $hierselects = array();
- foreach ($this->conditionalFields as $virtualfield => $cf) {
- $hierselects[$virtualfield] = DB_DATAOBJECT_STR;
- }
+ $hierselects = array();
+ foreach ($this->conditionalFields as $virtualfield => $cf) {
+ $hierselects[$virtualfield] = DB_DATAOBJECT_STR;
+ }
foreach ($this->panelFields as $fields => $field){
$hierselects[$fields] = DB_DATAOBJECT_STR;
}
- return array_merge(parent::table(), $hierselects);
+ return array_merge(parent::table(), $hierselects);
}
var $fb_textFields = array('notes','address','notesonlocation','panelsubject');
var $fb_fieldsToRender = array( 'registerno','panelcatagory','companyname','ownership',
'nationalno', 'mothername',
'address', 'teleno', 'faxno',
- 'mobileno', 'pobox', 'panelsubject','road_route_district',
+ 'mobileno', 'pobox', 'panelsubject','road_route_district',
'carrigewaywidth', 'shoulderwidth', 'numberoflanes',
'medianwidth','date','x','y','routetodistance','paneltodistance',
'routedirection','notesonlocation','nearstpanelx','nearstpanely',
@@ -98,12 +98,12 @@
'receiptdate','insurancereceiptno','insurancereceiptdate',
'contractno','notes','idroadiddistrict','permitno','contractunitprice',
'verificationreceiptno','verificationreceiptdate','verificationamount','image','boolrow');
-
+
var $fb_preDefOrder = array( 'companyname','panelcatagory', 'ownership',
'registerno',
'nationalno', 'mothername',
'address', 'teleno', 'faxno',
- 'mobileno', 'pobox', 'panelsubject','road_route_district', 'carrigewaywidth',
+ 'mobileno', 'pobox', 'panelsubject','road_route_district', 'carrigewaywidth',
'shoulderwidth', 'numberoflanes',
'medianwidth','date','routetodistance','x','y',
'routedirection','notesonlocation','paneltodistance','nearstpanelx','nearstpanely',
@@ -112,45 +112,45 @@
'receiptdate','insurancereceiptno','insurancereceiptdate',
'verificationreceiptno','verificationreceiptdate','verificationamount',
'contractno','contractunitprice','notes','image','idroadiddistrict');
-
+
var $fb_linkElementTypes = array('facecount' => 'radio');
var $fb_enumFields = array('facecount');
var $fb_enumOptions = array('facecount' => array('1' => '1', '2' => '2'));
-
-var $fb_selectAddEmpty = array('ownership');
- var $conditionalFields = array(
- 'road_route_district' => array(
- 'district:public.panel' => array('district'),
+var $fb_selectAddEmpty = array('ownership');
+
+ var $conditionalFields = array(
+ 'road_route_district' => array(
+ 'district:public.panel' => array('district'),
'roadname:public.panel' => array('district', 'roadname'),
'routename:public.panel' => array('district', 'roadname','routename')
- )
- );
+ )
+ );
-var $panelFields = array(
- 'paneltypedimension' => array(
- 'routetype' => array('routetype'),
+var $panelFields = array(
+ 'paneltypedimension' => array(
+ 'routetype' => array('routetype'),
'paneltype' => array('routetype', 'paneltype'),
'paneldimension' => array('routetype', 'paneltype','paneldimension')
-
- )
- );
-
+
+ )
+ );
+
function postGenerateForm(&$form) {
/**
* \todo Use regular expressions for rules.
- */
+ */
$form->addRule('x', _('Please Enter the X coordinate for the panel.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
-
+
$form->addRule('receiptno', _('Please Enter the receipt no. for the panel.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('receiptdate', _('Please Enter the receipt date for the panel.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
-
-
-
+
+
+
$form->addRule('y', _('Please Enter the Y coordinate for the panel.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('routetodistance', _('Please Enter the distance from the link start.'),
@@ -173,10 +173,10 @@
'numeric', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('paneltypedimension', _('Please select the panel type and dimension.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
-
+
$form->addRule('permitno', _('Please select the permission no.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
-
+
/*$form->addRule('annualfees', _('Please enter the annual fees.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('usefees', _('Please enter the use fees.'),
@@ -188,16 +188,16 @@
*/
//from Areejs comments
-
+
$form->addRule('image', _('The image type should be JPG.'),
'filename', '/.*\.[jJ][pP][gG]$/','client');
//Letters only
-
+
$form->addRule('companyname', _('The Company name should be only letters.'),
'regex','/^[^1234567890]*$/','client');
$form->addRule('mothername', _('The Mother name should be only letters.'),
'lettersonly',null,'client');
-
+
$form->addRule('nationalno', _('The National No. should be only numeric.'),
'numeric',null,'client');
$form->addRule('nationalno', _('The entered value should be only numeric.'),
@@ -218,7 +218,7 @@
'numeric',null,'client');
$form->addRule('insurancereceiptno', _('The entered value should be only numeric.'),
'numeric',null,'client');
-
+
$form->addRule('annualfees', _('Please select the panel dimension, the value should not be zero'),
'numeric',null,'client');
$form->addRule('panelarea', _('Please select the panel dimension, the value should not be zero'),
@@ -230,17 +230,17 @@
'nonzero',null,'client');
$form->addRule('panelarea', _('Please select the panel dimension, the value should not be zero'),
'nonzero',null,'client');
-
+
$form->addRule('totalfees', _('Please select the panel dimension, the value should not be zero.'),
'nonzero',null,'client');
-
-
+
+
//Max length
$form->addRule('companyname', _('The Company name should be 125 letters max.'),
'maxlength',125);
$form->addRule('mothername', _('The Mother name should be 125 letters max.'),
'maxlength',32);
-
+
$form->addRule('address', _('The Address should be 125 letters max.'),
'maxlength',125,'client');
$form->addRule('telno', _('The Entered telephone value should 10 letters max.'),
@@ -257,12 +257,12 @@
'rangelength',array(0,1),'client');
$form->addRule('numberoflanes', _('The entered number of lanes value should be between 1 and 8.'),
'regex','/^[^90A-z]*$/','client');
-
+
// $form->addRule('shoulderwidth', _('The entered shoulder width value should be between 1 and 5.'),
//'rangelength',array(0,1),'client');
// $form->addRule('shoulderwidth', _('The entered shoulder width value should be between 1 and 5.'),
//'regex','/^[^67890A-z]*$/','client');
-
+
$form->addRule('carrigewaywidth', _('The entered carrigeway width value should be between 2 and 5.'),
'rangelength',array(0,1),'client');
$form->addRule('carrigewaywidth', _('The entered carrigeway width value should be between 2 and 5.'),
@@ -285,15 +285,15 @@
'maxlength', 10);
$form->addRule('notes', _('The entered value should be 125 letters max.'),'maxlength',
125);
-
-
+
+
$form->Applyfilter('__ALL__',trim);
$form->setRequiredNote('<span style="font-size:80%; color:#ff0000;"
>*</span><span style="font-size:80%;"> '.
_('denotes required field').'</span>');
$form->setDefaults(array('panelcatagory'=>3,'facecount'=>1,'boolrow'=>1));
}
-
+
function update($do = false) {
if(isset($this->x)&&isset($this->y)) {
$this->the_geom = 'POINT('.$this->x.' '.$this->y.')';
@@ -304,7 +304,7 @@
//$this->image='test';
unset ($_SESSION['routetypevalue']);
}
-
+
return parent::update($do);
}
@@ -319,8 +319,8 @@
// $this->image='test';
unset ($_SESSION['routetypevalue']);
}
-
+
return parent::insert();
}
@@ -330,13 +330,13 @@
isset($_REQUEST['y'])&&is_numeric($_REQUEST['y'])) {
$this->x = (float) $_REQUEST['x'];
$this->y = (float) $_REQUEST['y'];
-
+
$objDB =& $this->getDatabaseConnection();
}
}
-function preGenerateForm(&$fb){
-
- $this->fb_fieldLabels = array('companyname'=>_('Company Name:'),'panelcatagory' =>_('Panel Catagory:'),
+function preGenerateForm(&$fb){
+
+ $this->fb_fieldLabels = array('companyname'=>_('Company Name:'),'panelcatagory' =>_('Panel Catagory:'),
'ownership'=>_('Ownership:'),
'nationalno'=>_('National No.:'),'mothername'=>_('Mother Name:'),
'address'=>_('Address:'),'teleno'=>_('Telephone:'),'faxno'=>_('Fax No.:'),
@@ -363,30 +363,32 @@
'verificationreceiptno'=>_("Verification Receipt No"),
'verificationreceiptdate'=>_("Verification Receipt Date"),
'verificationamount'=>_("Verification Amount"));
-
-
+
+
$this->fb_formHeaderText= _('Advertisement Panel Information Data Entry');
- $this->fb_preDefElements = array();
+ $this->fb_preDefElements = array();
$this->fb_ruleViolationMessage = _('%s: The value you have entered is not valid.');
$this->fb_requiredRuleMessage = _('%s: This field is required.');
$this->fb_submitText = _('Submit');
- /* the hierselect construct */
+ /* the hierselect construct */
$month = date('m');
foreach ($this->panelFields as $fields => $field){
- $desc = (isset($this->fb_fieldLabels[$fields])?$this->fb_fieldLabels[$fields]:$fields);
+ $desc = (isset($this->fb_fieldLabels[$fields])?$this->fb_fieldLabels[$fields]:$fields);
// $attrs = array('onchange' =>
//"javascript:alert(this.options[this.selectedIndex].value);");
$attrs = array('onchange' =>
"javascript:getcost(this.options[this.selectedIndex].value);",'onblur' =>
"javascript:getcost(this.options[this.selectedIndex].value);",'onclick' =>
"javascript:getcost(this.options[this.selectedIndex].value);");
-
+
echo '<script type="text/javascript">
<!--
function setitems(val){
- if (val==1){
+ if (val==1){
document.forms[2].contractno.disabled=false
document.forms[2].contractunitprice.disabled=false
+ document.forms[2].boolrow.value=2
+
}
if (val==3){
document.forms[2].companyname.disabled=false
@@ -416,36 +418,38 @@
document.forms[2].contractno.disabled=true
document.forms[2].contractunitprice.disabled=true
}
-
-
+
+
}
function getcost(val){
if ( 2 ) {
-
+
//alert (val);
var passed = val;
var xpanel;
var Startindex = document.forms[2][38].value.search(/ /);
-
+
var Startannual = document.forms[2][38].value.search(/-/);
xpanel=document.forms[2][38].value.substr(0,Startindex);
var ypanel=document.forms[2][38].value.substr(Startindex+2,Startannual-(Startindex+2));
- //Working to fill the area field.
+ //Working to fill the area field.
//document.forms[2].panelarea.value=document.forms[2][38].value;
document.forms[2].panelarea.value=parseInt(ypanel*xpanel);
-
-
+
+
var StartUse = document.forms[2][38].value.search(/M/);
var StartPanel = document.forms[2][38].value.search(/P/);
//Check the annual fees
document.forms[2].annualfees.value=document.forms[2][38].value.substr(Startannual+1,StartUse-(Startannual+1));
////Check the Use fees
+ if (document.forms[2].boolrow.value!=2){
document.forms[2].usefees.value=document.forms[2][38].value.substr(StartUse+1,StartPanel-(StartUse+1));
+ }
var annualfees = (document.forms[2][38].value.substr(Startannual+1,StartUse-(Startannual+1)));
var usefees=document.forms[2][38].value.substr(StartUse+1);
//Check face count
-
+
if(document.forms[2].facecount.length == undefined)
if(document.forms[2].facecount.checked)
return document.forms[2].facecount.value;
@@ -456,34 +460,34 @@
var facecount= document.forms[2].facecount[i].value;
}
}
-
+
//alert (facecount);
var startmonth=document.forms[2][22].value;
//alert (startmonth);
var varannualfees=document.forms[2].annualfees.value;
var varusefees=document.forms[2].usefees.value;
-
-
+
+
var totalfees = (((ypanel*xpanel) * annualfees * facecount)+ parseInt(usefees))*((13-startmonth)/12);
document.forms[2].totalfees.value=parseInt(totalfees);
-
-
+
+
var applicationtype='; print_r("'".$_REQUEST['type']."'");
echo ';
-
-
+
+
}
-
+
}
function checkvalue(val){
- alert ("Hello");
+ alert ("Hello");
}
-
+
function getpanelcost(){
-
+
var panelarea2=parseInt(document.forms[2].panelarea.value);
-
+
var annualfees2=parseInt(document.forms[2].annualfees.value);
if(document.forms[2].facecount.length == undefined)
if(document.forms[2].facecount.checked)
@@ -495,19 +499,19 @@
var facecount= document.forms[2].facecount[i].value;
}
}
-
-
+
+
var usefees2=parseInt(document.forms[2].usefees.value);
var startmonth=document.forms[2][22].value;
if ((document.forms[2].annualfees.value!=0)){
var totalfeesclick = (((panelarea2*annualfees2)*facecount)+usefees2)*((13-startmonth)/12);
document.forms[2].totalfees.value=totalfeesclick;
-
+
}
- }
-
-
-
+ }
+
+
+
function setface(val){
if (val==2){
document.forms[2][34].disabled=true
@@ -515,7 +519,7 @@
document.forms[2][33].checked=true
}else{
document.forms[2][34].disabled=false
-
+
}
}
function getpaneltype(val){
@@ -530,7 +534,7 @@
// alert("test1");
selectedvalue=1;
paneldimension="14 X 4-50M1000P1";
-
+
}
//alert (secondaryindex)
if((routetypeindex == 3)&&(secondaryindex==-1)) {
@@ -541,47 +545,47 @@
}
if((routetypeindex> 3)&&(secondaryindex!=-1)) {
//Village
-
+
selectedvalue=3;
paneldimension="3 X 2-20M100P4";
}
-
+
document.forms[2][36].value=selectedvalue;
document.forms[2][36].disabled=true;
document.forms[2].routetypevalue.value=selectedvalue;
-
+
//alert (selectedvalue);
}
//checkvalue(1);
_hs_swapOptions(document.forms[2],"paneltypedimension",0);
getcost(1);
-
+
}
//-->
- </script>';
-
+ </script>';
+
//065699071
//Add break after each hierselect.
//$hierselectPanel =& HTML_QuickForm::createElement('hierselect', $fb->getFieldName($fields), $desc,$attrs,"<br />");
$hierselectPanel =& HTML_QuickForm::createElement('hierselect', $fb->getFieldName($fields), $desc,$attrs);
-
-
+
+
$link = dbx_connect(DBX_PGSQL, "localhost", "rapc", $_SESSION['UserName'],$_SESSION['Password'])
or die("Could not connect to PostgreSQL");
-
+
$result = dbx_query($link, "select 0, '[Select One]' union all select codedvalue,description from routetype");
$select1 = array();
-
+
foreach ($result->data as $row) {
$codedvalue=$row[0];
$descriptioin = $row[1];
$select1[$codedvalue]=_($descriptioin);
}
-
+
$result = dbx_query($link, "select 0,0, '[Select One]' union all select routetype,paneltype,paneltype.description from
typedimensionfees,paneltype where paneltype.codedvalue = typedimensionfees.paneltype");
$select2 = array();
-
+
foreach ($result->data as $row) {
$routetype = $row[0];
$codedvalue=$row[1];
@@ -589,10 +593,10 @@
$select2[$routetype][$codedvalue]=_($descriptioin);
}
$result = dbx_query($link, "select routetype,paneltype,
- paneldimension.description,paneldimension.description,annualfees.description
+ paneldimension.description,paneldimension.description,annualfees.description
,usefees.description,paneldimension from
- typedimensionfees,usefees,paneldimension,annualfees where paneldimension.codedvalue =
- typedimensionfees.paneldimension and annualfees.codedvalue=annualfees and
+ typedimensionfees,usefees,paneldimension,annualfees where paneldimension.codedvalue =
+ typedimensionfees.paneldimension and annualfees.codedvalue=annualfees and
usefees.codedvalue=usefees");
$select3 = array();
$select3[0][0][0]= _('Select One');
@@ -604,17 +608,17 @@
$annual = $row[4];
$usefees = $row[5];
$paneldimension = $row[6];
-
-
+
+
$select3[$routetype][$codedvalue][$descriptioin."-".$annual."M".
$usefees."P".$paneldimension]=_($descriptioin);
}
- $hierselectPanel->setOptions(array($select1,$select2,$select3));
-
+ $hierselectPanel->setOptions(array($select1,$select2,$select3));
+
$this->fb_preDefElements[$fields] = $hierselectPanel;
- }
-
- foreach ($this->conditionalFields as $virtualfield => $cf) {
+ }
+
+ foreach ($this->conditionalFields as $virtualfield => $cf) {
$desc = (isset($this->fb_fieldLabels[$virtualfield])?$this->fb_fieldLabels[$virtualfield]:$virtualfield);
$attrs = array('onchange' =>
"javascript:getpaneltype(this.options[this.selectedIndex].value);",'onblur' =>
@@ -622,37 +626,37 @@
"javascript:getpaneltype(this.options[this.selectedIndex].value);",
'onselect' =>
"javascript:getpaneltype(this.options[this.selectedIndex].value);");
-
+
$hierselect =& HTML_QuickForm::createElement('hierselect', $fb->getFieldName($virtualfield), $desc,$attrs);
- $link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], "mpw_ris", "mpw_ris")
-
+ $link = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], $_SESSION["strOracleUser"], $_SESSION["strOraclePassword"])
+
or die("Could not connect to Oracle");
-
+
$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
$select1 = array();
foreach ($result->data as $row) {
-
+
//foreach ($row as $field) {
$district=$row[0];
$select1[$district]=_($district);
//}
-
+
}
-
+
$result = dbx_query($link, 'select * from roadnameswithdistrict');
$select2 = array();
foreach ($result->data as $row){
$district= $row[3];
$roadname = $row[1];
$select2[$district][$roadname]=$roadname;
-
+
}
//select routenameswithdistrict.routename,flatfeatures_cway.cway_width_B,
//flatfeatures_cway.cway_nrlane_b,flatfeatures_shoul.SHOUL_WIDTH_B from
- //routenameswithdistrict left outer join flatfeatures_cway on
- //(routenameswithdistrict.routename=flatfeatures_cway.routename) left outer join
- // flatfeatures_shoul on (routenameswithdistrict.routename=flatfeatures_shoul.routename)
-
+ //routenameswithdistrict left outer join flatfeatures_cway on
+ //(routenameswithdistrict.routename=flatfeatures_cway.routename) left outer join
+ // flatfeatures_shoul on (routenameswithdistrict.routename=flatfeatures_shoul.routename)
+
$result = dbx_query($link, 'select * from routenameswithdistrict');
$select3 = array();
foreach ($result->data as $row){
@@ -660,18 +664,18 @@
$routename = $row[0];
$district = $row[3];
$select3[$district][$roadname][$routename]=$routename;
-
+
}
- $hierselect->setOptions(array($select1, $select2,$select3));
- //echo "<pre>";
-
- //echo "</pre>";
- //$hierselect->setOptions($select);
- /* init the hierselect with the values from the database */
-
- /* we are done! */
- $this->fb_preDefElements[$virtualfield] = $hierselect;
-
+ $hierselect->setOptions(array($select1, $select2,$select3));
+ //echo "<pre>";
+
+ //echo "</pre>";
+ //$hierselect->setOptions($select);
+ /* init the hierselect with the values from the database */
+
+ /* we are done! */
+ $this->fb_preDefElements[$virtualfield] = $hierselect;
+
}
$arrpanelcatagory=array(1=>_('Contract'),3=>_('Private'),2=>_('Goverment'));
$sattrs = array('onchange' =>
@@ -681,97 +685,97 @@
$this->fb_preDefElements['panelcatagory'] = HTML_QuickForm::createElement(
'select', 'panelcatagory', _('Panel catagory'),$arrpanelcatagory,$sattrs);
$arryesno=array(1=>_('Yes'),2=>_('No'));
-
+
$attrs = array('onchange' =>
"javascript:setface(this.options[this.selectedIndex].value);",'onblur' =>
"javascript:setface(this.options[this.selectedIndex].value);",'onclick' =>
"javascript:setface(this.options[this.selectedIndex].value);");
$this->fb_preDefElements['medianwidth'] = HTML_QuickForm::createElement(
- 'select', 'medianwidth', _('Median available'),$arryesno,$attrs);
+ 'select', 'medianwidth', _('Median available'),$arryesno,$attrs);
$this->fb_preDefElements['image'] = HTML_QuickForm::createElement(
- 'file', 'image', _('Panel image'),null,'client');
-
-
+ 'file', 'image', _('Panel image'),null,'client');
+
+
if ($_REQUEST['type']=="old"){
$this->fb_preDefElements['panelarea']=HTML_QuickForm::createElement(
'text', 'panelarea', _('Panel Area:'));
$this->fb_preDefElements['usefees']=HTML_QuickForm::createElement(
- 'text', 'usefees', _('Use fees'));
+ 'text', 'usefees', _('Use fees'));
$this->fb_preDefElements['annualfees']=HTML_QuickForm::createElement(
- 'text', 'annualfees', _('Annualfees'));
+ 'text', 'annualfees', _('Annualfees'));
$this->fb_preDefElements['totalfees']=HTML_QuickForm::createElement(
'text', 'totalfees', _('Total fees'));
$attrs = array('onchange' =>
"javascript:getcost(0);",'onblur' =>
"javascript:getcost(0);",'onclick' =>
"javascript:getcost(0);");
-
+
$this->fb_preDefElements['date']=HTML_QuickForm::createElement(
'date', 'date', _('Date'),array('minYear'=>'1975','format'=>'dmY'),$attrs);
-
+
}else{
$this->fb_preDefElements['panelarea']=HTML_QuickForm::createElement(
- 'text', 'panelarea', _('Panel Area'),array("readonly=true"));
+ 'text', 'panelarea', _('Panel Area'),array("readonly=true"));
$this->fb_preDefElements['usefees']=HTML_QuickForm::createElement(
- 'text', 'usefees', _('Use fees'),array("readonly=true"));
+ 'text', 'usefees', _('Use fees'),array("readonly=true"));
$this->fb_preDefElements['annualfees']=HTML_QuickForm::createElement(
- 'text', 'annualfees', _('Annualfees'),array("readonly=true"));
+ 'text', 'annualfees', _('Annualfees'),array("readonly=true"));
$this->fb_preDefElements['totalfees']=HTML_QuickForm::createElement(
- 'text', 'totalfees', _('Total fees'),array("readonly=true"));
+ 'text', 'totalfees', _('Total fees'),array("readonly=true"));
$attrs = array('onchange' =>
"javascript:getcost(0);",'onblur' =>
"javascript:getcost(0);",'onclick' =>
"javascript:getcost(0);");
-
+
$this->fb_preDefElements['date']=HTML_QuickForm::createElement(
'date', 'date', _('Date'),array('minYear'=>'2001','format'=>'dmY'),$attrs);
-
+
}
-
+
$this->fb_preDefElements['registerno'] = HTML_QuickForm::createElement(
'text', 'registerno', _('Registeration No.:'),array('onclick' =>
" if (this.value!='') { javascript:xajax_myFunction(this.value); } ",'onfocus' =>
"if (this.value!='') { javascript:xajax_myFunction(this.value); } ",'onblur' =>
" if (this.value!='') { javascript:xajax_myFunction(this.value); }"));
-
+
$this->fb_preDefElements['totalfees'] = HTML_QuickForm::createElement(
'text', 'totalfees', _('Total fees:'),array('onclick' =>
"getpanelcost();",'onfocus' =>
"getpanelcost();",'onblur' =>
"getpanelcost();"));
-
+
$this->fb_preDefElements['boolrow'] = HTML_QuickForm::createElement(
'select', 'boolrow', _('Right of Way:'),array(1=>_('Yes'),2=>_('No')),array('onclick' =>
"if (this.options[this.selectedIndex].value==2)
{ document.forms[2].usefees.value=0; getpanelcost(); } else { getcost(0); } ",'onblur' =>
"if (this.options[this.selectedIndex].value==2)
{ document.forms[2].usefees.value=0; getpanelcost(); }else { getcost(0); } "));
-
-
-
-
-
+
+
+
+
+
}
-function preProcessForm(&$values)
-{
- /* put data from hierselect in corresponding database fields */
- foreach ($this->conditionalFields as $virtualfield => $cf) {
- $count = 0;
- foreach ($cf as $key => $fields) {
- list($localfield, $tmp) = explode(':', $key);
- $this->$localfield = $values[$virtualfield][$count];
- $count++;
- }
+function preProcessForm(&$values)
+{
+ /* put data from hierselect in corresponding database fields */
+ foreach ($this->conditionalFields as $virtualfield => $cf) {
+ $count = 0;
+ foreach ($cf as $key => $fields) {
+ list($localfield, $tmp) = explode(':', $key);
+ $this->$localfield = $values[$virtualfield][$count];
+ $count++;
+ }
}
-
+
$this->routetype=$_POST['paneltypedimension'][0];
$this->paneltype=$_POST['paneltypedimension'][1];
-
-
-
-}
+
+
+
+}
/**
* Return an HTML_Table containing all available translations. The table
* includes a link to a page for subscriber editing.
@@ -806,7 +810,7 @@
$objTable->setCellContents($i, 5, $this->teleno);
$objTable->setCellContents($i, 6, $this->faxno);
$objTable->setCellContents($i, 7, $this->mobileno);
- if ($action=='view'){
+ if ($action=='view'){
$ref='<a href="panelpage.php?PHPSESSID='.session_id().
'&action=map&id='. $this->id.'">'.
_('[View on Map]').'</a>';
@@ -815,12 +819,12 @@
$objTable->setCellContents($i, 8, '<a href="'.$strPagePath.
'panelpage.php?'.
"action=edit&id=".$this->id.
- "&backlink=".urlencode($strBacklink)."\">"._("[Edit]")."</a>".$ref);
+ "&backlink=".urlencode($strBacklink)."\">"._("[Edit]")."</a>".$ref);
$i++;
}
}
return $objTable;
}
-
+
}
Modified: trunk/rapc/include/i18n.php
===================================================================
--- trunk/rapc/include/i18n.php 2007-02-08 07:14:21 UTC (rev 50)
+++ trunk/rapc/include/i18n.php 2007-02-11 12:32:41 UTC (rev 51)
@@ -97,6 +97,7 @@
_("Ministry of Tourisim");
_("Ministry of Public Works");
_("Ajlun");
+_("Advertisement");
?>
Modified: trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-02-08 07:14:21 UTC (rev 50)
+++ trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-02-11 12:32:41 UTC (rev 51)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: mpwh\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-02-05 10:34+0200\n"
+"PO-Revision-Date: 2007-02-11 11:14+0200\n"
"Last-Translator: t <t>\n"
"Language-Team: dc <mah...@do...>\n"
"MIME-Version: 1.0\n"
@@ -1548,6 +1548,10 @@
msgid "Ministry of Public Works"
msgstr "وزارة الاشغال العامة و الاسكان"
+#: ../../../include/i18n.php:100
+msgid "Advertisement"
+msgstr "لوحة اعلانية"
+
#: ../../../include/dataobject/Public_panel.php:144
msgid "Please Enter the X coordinate for the panel."
msgstr "الرجاء ادخال الاحداثية X للوحة"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
