Thread: [Rapc-commit] SF.net SVN: rapc: [4] trunk/rapc
Brought to you by:
maher_karim,
sdteffen
Menu
▾
▴
rapc-commit
|
From: <mah...@us...> - 2006-10-16 07:57:48
|
Revision: 4
http://svn.sourceforge.net/rapc/?rev=4&view=rev
Author: maher_karim
Date: 2006-10-16 00:52:30 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
Added Paths:
-----------
trunk/rapc/images/
trunk/rapc/images/about.png
trunk/rapc/images/administration-32.png
trunk/rapc/images/bill_loader.PNG
trunk/rapc/images/bullet_next.gif
trunk/rapc/images/buttons/
trunk/rapc/images/buttons/back_off.gif
trunk/rapc/images/buttons/back_on.gif
trunk/rapc/images/buttons/coords_off.gif
trunk/rapc/images/buttons/coords_on.gif
trunk/rapc/images/buttons/digitize_off.gif
trunk/rapc/images/buttons/digitize_on.gif
trunk/rapc/images/buttons/download_off.gif
trunk/rapc/images/buttons/download_on.gif
trunk/rapc/images/buttons/fwd_off.gif
trunk/rapc/images/buttons/home_off.gif
trunk/rapc/images/buttons/home_on.gif
trunk/rapc/images/buttons/identify_off.gif
trunk/rapc/images/buttons/identify_on.gif
trunk/rapc/images/buttons/measure_off.gif
trunk/rapc/images/buttons/measure_on.gif
trunk/rapc/images/buttons/pan/
trunk/rapc/images/buttons/pan/pane_off.gif
trunk/rapc/images/buttons/pan/pann_off.gif
trunk/rapc/images/buttons/pan/pannw_off.gif
trunk/rapc/images/buttons/pan/pans_off.gif
trunk/rapc/images/buttons/pan/panw_off.gif
trunk/rapc/images/buttons/pan_e.gif
trunk/rapc/images/buttons/pan_n.gif
trunk/rapc/images/buttons/pan_off.gif
trunk/rapc/images/buttons/pan_on.gif
trunk/rapc/images/buttons/pan_s.gif
trunk/rapc/images/buttons/pan_w.gif
trunk/rapc/images/buttons/print_off.gif
trunk/rapc/images/buttons/print_on.gif
trunk/rapc/images/buttons/reload_off.gif
trunk/rapc/images/buttons/reload_on.gif
trunk/rapc/images/buttons/resize_off.gif
trunk/rapc/images/buttons/select_off.gif
trunk/rapc/images/buttons/select_on.gif
trunk/rapc/images/buttons/separatorh.gif
trunk/rapc/images/buttons/separatorv.gif
trunk/rapc/images/buttons/space.gif
trunk/rapc/images/buttons/zoomin_off.gif
trunk/rapc/images/buttons/zoomin_off0.gif
trunk/rapc/images/buttons/zoomin_on.gif
trunk/rapc/images/buttons/zoomin_on.gif_
trunk/rapc/images/buttons/zoomminus.gif
trunk/rapc/images/buttons/zoomminus0.gif
trunk/rapc/images/buttons/zoomout_off.gif
trunk/rapc/images/buttons/zoomout_off_0.gif
trunk/rapc/images/buttons/zoomout_on.gif
trunk/rapc/images/buttons/zoomplus.gif
trunk/rapc/images/buttons/zoomplus0.gif
trunk/rapc/images/config-language.png
trunk/rapc/images/dccss-install.ico
trunk/rapc/images/dccss-uninstall.ico
trunk/rapc/images/dccss.ico
trunk/rapc/images/dccss_icon_16.png
trunk/rapc/images/dccss_small.png
trunk/rapc/images/documents.png
trunk/rapc/images/empty.gif
trunk/rapc/images/gnome-starthere.png
trunk/rapc/images/gtz.JPG
trunk/rapc/images/icon_collapse.gif
trunk/rapc/images/icon_draw.gif
trunk/rapc/images/icon_expand.gif
trunk/rapc/images/icon_eye.gif
trunk/rapc/images/icon_find.gif
trunk/rapc/images/icon_info.gif
trunk/rapc/images/icon_info2.gif
trunk/rapc/images/icon_info_av.gif
trunk/rapc/images/icon_landmark.png
trunk/rapc/images/icon_measure.gif
trunk/rapc/images/icon_minimize.gif
trunk/rapc/images/icon_pan.gif
trunk/rapc/images/icon_pdf.gif
trunk/rapc/images/icon_print.gif
trunk/rapc/images/icon_recentre.gif
trunk/rapc/images/icon_redraw.gif
trunk/rapc/images/icon_remove.gif
trunk/rapc/images/icon_track.gif
trunk/rapc/images/icon_update.gif
trunk/rapc/images/icon_zoomin.gif
trunk/rapc/images/icon_zoomin.png
trunk/rapc/images/icon_zoomout.gif
trunk/rapc/images/info.gif
trunk/rapc/images/installer-header.bmp
trunk/rapc/images/java_off.gif
trunk/rapc/images/java_on.gif
trunk/rapc/images/jordan.PNG
trunk/rapc/images/jordan.jpg
trunk/rapc/images/layer_node.gif
trunk/rapc/images/mpwh.PNG
trunk/rapc/images/ochain.gif
trunk/rapc/images/oempty.gif
trunk/rapc/images/ominus.gif
trunk/rapc/images/ominusEnd.gif
trunk/rapc/images/ominusStart.gif
trunk/rapc/images/onode.gif
trunk/rapc/images/onodeEnd.gif
trunk/rapc/images/oplus.gif
trunk/rapc/images/oplusEnd.gif
trunk/rapc/images/oplusStart.gif
trunk/rapc/images/php-power-white.gif
trunk/rapc/images/poweredbymysql-88.png
trunk/rapc/images/remove_temporary_files.png
trunk/rapc/images/shapefile_dumper.png
trunk/rapc/images/spinner.gif
trunk/rapc/images/stock-tool-move.png
trunk/rapc/images/stock_exit-16.png
trunk/rapc/images/stock_extended-help.png
trunk/rapc/images/stock_help-16.png
trunk/rapc/images/stock_refresh.png
trunk/rapc/images/stock_search.png
trunk/rapc/images/stock_zoom-in.png
trunk/rapc/images/stock_zoom-out.png
trunk/rapc/images/thmIdOn13x13.gif
trunk/rapc/images/tree_layer.gif
trunk/rapc/images/tree_layers.gif
trunk/rapc/images/tree_server.gif
trunk/rapc/images/workorder.png
trunk/rapc/images/workswithmysql-88.png
trunk/rapc/images/zoom_to_landmark.png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-10-16 08:10:55
|
Revision: 5
http://svn.sourceforge.net/rapc/?rev=5&view=rev
Author: maher_karim
Date: 2006-10-16 01:00:16 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
add doc
Added Paths:
-----------
trunk/rapc/doc/
trunk/rapc/doc/administration/
trunk/rapc/doc/administration/docbook.css
trunk/rapc/doc/administration/figure/
trunk/rapc/doc/administration/figure/administrative_tools_icon.png
trunk/rapc/doc/administration/figure/apache_information.png
trunk/rapc/doc/administration/figure/apache_install.png
trunk/rapc/doc/administration/figure/apache_license.png
trunk/rapc/doc/administration/figure/apache_location.png
trunk/rapc/doc/administration/figure/apache_readme.png
trunk/rapc/doc/administration/figure/apache_setup_type.png
trunk/rapc/doc/administration/figure/apache_wizard.png
trunk/rapc/doc/administration/figure/client_server_deployment.BMP
trunk/rapc/doc/administration/figure/client_server_deployment.png
trunk/rapc/doc/administration/figure/client_server_deployment.svg
trunk/rapc/doc/administration/figure/control_panel.png
trunk/rapc/doc/administration/figure/dccss_components.PNG
trunk/rapc/doc/administration/figure/dccss_database_connection.png
trunk/rapc/doc/administration/figure/dccss_license.png
trunk/rapc/doc/administration/figure/dccss_location.png
trunk/rapc/doc/administration/figure/dccss_uml.png
trunk/rapc/doc/administration/figure/dccss_uml.vsd
trunk/rapc/doc/administration/figure/gis_data_review.png
trunk/rapc/doc/administration/figure/internet_deployment.png
trunk/rapc/doc/administration/figure/internet_deployment.svg
trunk/rapc/doc/administration/figure/php_components.png
trunk/rapc/doc/administration/figure/php_license.png
trunk/rapc/doc/administration/figure/php_location.png
trunk/rapc/doc/administration/figure/poedit_php_parser.png
trunk/rapc/doc/administration/figure/poedit_php_path.png
trunk/rapc/doc/administration/figure/postgis_components.png
trunk/rapc/doc/administration/figure/postgis_database_connection.png
trunk/rapc/doc/administration/figure/postgis_installation_complete.png
trunk/rapc/doc/administration/figure/postgis_license.png
trunk/rapc/doc/administration/figure/postgis_location.png
trunk/rapc/doc/administration/figure/postgis_patience.png
trunk/rapc/doc/administration/figure/postgis_reboot.png
trunk/rapc/doc/administration/figure/postgresql_account_error.png
trunk/rapc/doc/administration/figure/postgresql_contrib_modules.png
trunk/rapc/doc/administration/figure/postgresql_database_cluster.png
trunk/rapc/doc/administration/figure/postgresql_enable_postgis.png
trunk/rapc/doc/administration/figure/postgresql_installation_complete.png
trunk/rapc/doc/administration/figure/postgresql_installation_notes.png
trunk/rapc/doc/administration/figure/postgresql_installation_options.png
trunk/rapc/doc/administration/figure/postgresql_installation_ready.png
trunk/rapc/doc/administration/figure/postgresql_language_selection.png
trunk/rapc/doc/administration/figure/postgresql_log_on_as_service.png
trunk/rapc/doc/administration/figure/postgresql_password.png
trunk/rapc/doc/administration/figure/postgresql_procedural_languages.png
trunk/rapc/doc/administration/figure/postgresql_service_configuration.png
trunk/rapc/doc/administration/figure/postgresql_users.png
trunk/rapc/doc/administration/figure/postgresql_welcome.png
trunk/rapc/doc/administration/figure/postmaster_service.png
trunk/rapc/doc/administration/figure/postmaster_service_logon.png
trunk/rapc/doc/administration/figure/postmaster_service_properties.png
trunk/rapc/doc/administration/figure/rapc_components.PNG
trunk/rapc/doc/administration/figure/rapc_database_connection.png
trunk/rapc/doc/administration/figure/rapc_location.png
trunk/rapc/doc/administration/figure/rapc_uml.png
trunk/rapc/doc/administration/figure/rapc_uml.vsd
trunk/rapc/doc/administration/figure/service_start.png
trunk/rapc/doc/administration/figure/service_stop.png
trunk/rapc/doc/administration/figure/services_context_menu.png
trunk/rapc/doc/administration/figure/services_icon.png
trunk/rapc/doc/administration/figure/standalone_deployment.png
trunk/rapc/doc/administration/figure/standalone_deployment.svg
trunk/rapc/doc/administration/figure/uml_legend.png
trunk/rapc/doc/administration/figure/windows_users.png
trunk/rapc/doc/administration/figure/windows_users.svg
trunk/rapc/doc/administration/images/
trunk/rapc/doc/administration/images/blank.png
trunk/rapc/doc/administration/images/callouts/
trunk/rapc/doc/administration/images/callouts/1.png
trunk/rapc/doc/administration/images/callouts/10.png
trunk/rapc/doc/administration/images/callouts/11.png
trunk/rapc/doc/administration/images/callouts/12.png
trunk/rapc/doc/administration/images/callouts/13.png
trunk/rapc/doc/administration/images/callouts/14.png
trunk/rapc/doc/administration/images/callouts/15.png
trunk/rapc/doc/administration/images/callouts/2.png
trunk/rapc/doc/administration/images/callouts/3.png
trunk/rapc/doc/administration/images/callouts/4.png
trunk/rapc/doc/administration/images/callouts/5.png
trunk/rapc/doc/administration/images/callouts/6.png
trunk/rapc/doc/administration/images/callouts/7.png
trunk/rapc/doc/administration/images/callouts/8.png
trunk/rapc/doc/administration/images/callouts/9.png
trunk/rapc/doc/administration/images/caution.png
trunk/rapc/doc/administration/images/caution.svg
trunk/rapc/doc/administration/images/draft.png
trunk/rapc/doc/administration/images/example.png
trunk/rapc/doc/administration/images/home.png
trunk/rapc/doc/administration/images/home.svg
trunk/rapc/doc/administration/images/important.png
trunk/rapc/doc/administration/images/important.svg
trunk/rapc/doc/administration/images/next.png
trunk/rapc/doc/administration/images/next.svg
trunk/rapc/doc/administration/images/note.png
trunk/rapc/doc/administration/images/note.svg
trunk/rapc/doc/administration/images/prev.png
trunk/rapc/doc/administration/images/prev.svg
trunk/rapc/doc/administration/images/tip.png
trunk/rapc/doc/administration/images/tip.svg
trunk/rapc/doc/administration/images/toc-blank.png
trunk/rapc/doc/administration/images/toc-minus.png
trunk/rapc/doc/administration/images/toc-plus.png
trunk/rapc/doc/administration/images/up.png
trunk/rapc/doc/administration/images/up.svg
trunk/rapc/doc/administration/images/warning.svg
trunk/rapc/doc/administration/rapc_administration_guide.xml
trunk/rapc/doc/administration/toc.hhc
trunk/rapc/doc/build.xml
trunk/rapc/doc/dccss_docbook_html.xsl
trunk/rapc/doc/dccss_docbook_htmlhelp.xsl
trunk/rapc/doc/dccss_docbook_pdf.xsl
trunk/rapc/doc/dcmms.xsl
trunk/rapc/doc/development/
trunk/rapc/doc/docbook.css
trunk/rapc/doc/rapc_docbook_html.xsl
trunk/rapc/doc/rapc_docbook_htmlhelp.xsl
trunk/rapc/doc/rapc_docbook_pdf.xsl
trunk/rapc/doc/user/
trunk/rapc/doc/user/ar/
trunk/rapc/doc/user/en/
trunk/rapc/doc/user/en/docbook.css
trunk/rapc/doc/user/en/figure/
trunk/rapc/doc/user/en/figure/error_page_cannot_be_displayed.png
trunk/rapc/doc/user/en/figure/stock-tool-move.png
trunk/rapc/doc/user/en/figure/stock_extended-help.png
trunk/rapc/doc/user/en/figure/stock_zoom-in.png
trunk/rapc/doc/user/en/figure/stock_zoom-out.png
trunk/rapc/doc/user/en/images/
trunk/rapc/doc/user/en/images/blank.png
trunk/rapc/doc/user/en/images/callouts/
trunk/rapc/doc/user/en/images/callouts/1.png
trunk/rapc/doc/user/en/images/callouts/10.png
trunk/rapc/doc/user/en/images/callouts/11.png
trunk/rapc/doc/user/en/images/callouts/12.png
trunk/rapc/doc/user/en/images/callouts/13.png
trunk/rapc/doc/user/en/images/callouts/14.png
trunk/rapc/doc/user/en/images/callouts/15.png
trunk/rapc/doc/user/en/images/callouts/2.png
trunk/rapc/doc/user/en/images/callouts/3.png
trunk/rapc/doc/user/en/images/callouts/4.png
trunk/rapc/doc/user/en/images/callouts/5.png
trunk/rapc/doc/user/en/images/callouts/6.png
trunk/rapc/doc/user/en/images/callouts/7.png
trunk/rapc/doc/user/en/images/callouts/8.png
trunk/rapc/doc/user/en/images/callouts/9.png
trunk/rapc/doc/user/en/images/caution.png
trunk/rapc/doc/user/en/images/caution.svg
trunk/rapc/doc/user/en/images/draft.png
trunk/rapc/doc/user/en/images/example.png
trunk/rapc/doc/user/en/images/home.png
trunk/rapc/doc/user/en/images/home.svg
trunk/rapc/doc/user/en/images/important.png
trunk/rapc/doc/user/en/images/important.svg
trunk/rapc/doc/user/en/images/next.png
trunk/rapc/doc/user/en/images/next.svg
trunk/rapc/doc/user/en/images/note.png
trunk/rapc/doc/user/en/images/note.svg
trunk/rapc/doc/user/en/images/prev.png
trunk/rapc/doc/user/en/images/prev.svg
trunk/rapc/doc/user/en/images/tip.png
trunk/rapc/doc/user/en/images/tip.svg
trunk/rapc/doc/user/en/images/toc-blank.png
trunk/rapc/doc/user/en/images/toc-minus.png
trunk/rapc/doc/user/en/images/toc-plus.png
trunk/rapc/doc/user/en/images/up.png
trunk/rapc/doc/user/en/images/up.svg
trunk/rapc/doc/user/en/images/warning.svg
trunk/rapc/doc/user/en/rapc_user_guide.xml
trunk/rapc/doc/user/en/toc.hhc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-12-13 05:42:58
|
Revision: 18
http://svn.sourceforge.net/rapc/?rev=18&view=rev
Author: maher_karim
Date: 2006-12-12 21:42:51 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
2006-12-13 Maher Abdel karim <mah...@do...>
* reports.php:add link to authorized panel installation.
* query.php: fix query.
* include/i81n.php:add translations.
* include/dataobject/public_panel.php:add more validation.add assign values
for routetype value to have it from the hidden value to solve the disabled
item value.
* authorized_panel_report.php:add authorized panel installation report.
* panelpage.php:Add new hidden value for routetype to handle the disabled
element value.
* include/dccsspage.php:
* include/header.php:
* rapc.nsi:adjust version number to be 0.5.0.
* panelinstallation_report.php:adjust query.
* script/create_views.sql:add new panelinformation view.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/conf/rapc_ar.map
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/dccsspage.php
trunk/rapc/include/header.php
trunk/rapc/include/i18n.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
trunk/rapc/query.php
trunk/rapc/rapc.nsi
trunk/rapc/reports.php
trunk/rapc/script/create_views.sql
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/changelog 2006-12-13 05:42:51 UTC (rev 18)
@@ -1,3 +1,20 @@
+2006-12-13 Maher Abdel karim <mah...@do...>
+
+ * reports.php:add link to authorized panel installation.
+ * query.php: fix query.
+ * include/i81n.php:add translations.
+ * include/dataobject/public_panel.php:add more validation.add assign values
+ for routetype value to have it from the hidden value to solve the disabled
+ item value.
+ * authorized_panel_report.php:add authorized panel installation report.
+ * panelpage.php:Add new hidden value for routetype to handle the disabled
+ element value.
+ * include/dccsspage.php:
+ * include/header.php:
+ * rapc.nsi:adjust version number to be 0.5.0.
+ * panelinstallation_report.php:adjust query.
+ * script/create_views.sql:add new panelinformation view.
+
2006-11-29 Steffen Macke <Ste...@do...>
* changelog: Restored deleted 2006-11-29 ChangeLog entry
Modified: trunk/rapc/conf/rapc_ar.map
===================================================================
--- trunk/rapc/conf/rapc_ar.map 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/conf/rapc_ar.map 2006-12-13 05:42:51 UTC (rev 18)
@@ -12,8 +12,8 @@
DATAPATTERN ''
TEMPLATEPATTERN ''
SHAPEPATH ''
- SYMBOLSET 'c:\program files\rapc\etc\symbols.sym'
- FONTSET 'c:\program files\rapc\etc\fonts.txt'
+ SYMBOLSET 'c:\program files\mpwh\rapc\etc\symbols.sym'
+ FONTSET 'c:\program files\mpwh\rapc\etc\fonts.txt'
STATUS on
IMAGECOLOR 255 255 255
IMAGETYPE png
@@ -24,13 +24,13 @@
MINSCALE 0
IMAGEPATH "/tmp/ms_tmp/"
IMAGEURL "/ms_tmp/"
- LOG 'c:\program files\rapc\conf\rapc_en.log'
+ LOG 'c:\program files\mpwh\rapc\conf\rapc_en.log'
METADATA
END #METADATA
END #WEB
REFERENCE
- IMAGE 'c:\program files\rapc\conf\rapc_en.jpg'
+ IMAGE 'c:\program files\mpwh\rapc\conf\rapc_en.jpg'
EXTENT 253216.66562500 200278.73750000 738982.64687500 718755.76250000
STATUS on
COLOR -1 -1 -1
@@ -114,7 +114,7 @@
TEMPLATE 'template.html'
#RASTERFILL_STYLE_SOLID
STYLE
- COLOR 255 251 195
+ # COLOR 255 251 195
BACKGROUNDCOLOR 255 255 255
END #STYLE
#OUTLINE SYMBOL
Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/include/dataobject/Public_panel.php 2006-12-13 05:42:51 UTC (rev 18)
@@ -292,6 +292,7 @@
if(isset($this->x)&&isset($this->y)) {
$this->the_geom = 'POINT('.$this->x.' '.$this->y.')';
$this->paneldimension=substr($_POST['paneltypedimension'][2],-1);
+ $this->routetype=$_POST['routetypevalue'];
$this->x=$this->x;
$this->y=$this->y;
//$this->image='test';
@@ -305,6 +306,7 @@
if(isset($this->x)&&isset($this->y)) {
$this->the_geom = 'POINT('.$this->x.' '.$this->y.')';
$this->paneldimension=substr($_POST['paneltypedimension'][2],-1);
+ $this->routetype=$_POST['routetypevalue'];
$this->x=$this->x;
$this->y=$this->y;
// $this->image='test';
@@ -527,6 +529,7 @@
document.forms[2][36].value=selectedvalue;
document.forms[2][36].disabled=true;
+ document.forms[2].routetypevalue.value=selectedvalue;
}
Modified: trunk/rapc/include/dccsspage.php
===================================================================
--- trunk/rapc/include/dccsspage.php 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/include/dccsspage.php 2006-12-13 05:42:51 UTC (rev 18)
@@ -271,7 +271,7 @@
'images/dccss_icon_16.png" />
<a href="'.$this->strPathInDccss.'index.php?PHPSESSID='.session_id().
'" title="'._('Click this link to go to the RAPC main page.').
- '">'._('RAPC').' 0.0.1</a>
+ '">'._('RAPC').' 0.5.0</a>
</span>
<span class="navigationend">
<form name="search" action=
Modified: trunk/rapc/include/header.php
===================================================================
--- trunk/rapc/include/header.php 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/include/header.php 2006-12-13 05:42:51 UTC (rev 18)
@@ -150,7 +150,7 @@
'images/dccss_icon_16.png" />
<a href="'.$strPathInDccss.'index.php?PHPSESSID='.session_id().
'" title="'._('Click this link to go to the DCCSS main page.').
- '">'._('RAPC').' 0.0.1</a>
+ '">'._('RAPC').' 0.5.0</a>
</span>
<span class="navigationend">
<form name="search" action=
Modified: trunk/rapc/include/i18n.php
===================================================================
--- trunk/rapc/include/i18n.php 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/include/i18n.php 2006-12-13 05:42:51 UTC (rev 18)
@@ -77,6 +77,10 @@
_("Zarqa");
_("Companyname");
_("Jan");
+_("Totalarea");
+_("Boolrow");
+_("Sum");
+_("No");
?>
Modified: trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2006-12-13 05:42:51 UTC (rev 18)
@@ -2,8 +2,8 @@
msgstr ""
"Project-Id-Version: mpwh\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2006-11-21 18:34+0200\n"
-"Last-Translator: Steffen Macke <Ste...@do...>\n"
+"PO-Revision-Date: 2006-12-12 13:11+0200\n"
+"Last-Translator: t <t>\n"
"Language-Team: dc <mah...@do...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -77,7 +77,7 @@
msgstr "رقم القطعة:"
#: ../../../address_confirmation.php:39
-#: ../../../include/dataobject/Public_panel.php:365
+#: ../../../include/dataobject/Public_panel.php:361
msgid "Submit"
msgstr "حفظ"
@@ -106,7 +106,6 @@
msgstr ""
#: ../../../address_confirmation.php:101
-#, fuzzy
msgid "Dispaly on Map"
msgstr "اظهار على الخريطة"
@@ -119,6 +118,94 @@
msgid "Nothing Processed"
msgstr "لم تتم المعالجة"
+#: ../../../authorized_panel_report.php:29
+#: ../../../panelinstallation_report.php:29
+msgid "Panel installation report"
+msgstr "تقرير تركيب اللوحات"
+
+#: ../../../authorized_panel_report.php:37
+#: ../../../illegal_panelinstallation_report.php:37
+#: ../../../panelinstallation_report.php:37
+msgid "Panel Installation"
+msgstr "تركيب اللوحة"
+
+#: ../../../authorized_panel_report.php:44
+#: ../../../illegal_panelinstallation_report.php:44
+#: ../../../panelinstallation_report.php:44
+#: ../../../query.php:76
+#: ../../../query.php:89
+#: ../../../query.php:99
+#: ../../../include/header.php:291
+#: ../../../include/i18n.php:47
+msgid "[Select One]"
+msgstr "[تحرير]"
+
+#: ../../../authorized_panel_report.php:53
+#: ../../../illegal_panelinstallation_report.php:53
+#: ../../../panelinstallation_report.php:53
+#: ../../../query.php:52
+msgid "District"
+msgstr "المحافظة"
+
+#: ../../../authorized_panel_report.php:54
+#: ../../../illegal_panelinstallation_report.php:54
+#: ../../../panelinstallation_report.php:54
+msgid "From Date:"
+msgstr "من تاريخ:"
+
+#: ../../../authorized_panel_report.php:55
+#: ../../../authorized_panel_report.php:57
+#: ../../../illegal_panelinstallation_report.php:55
+#: ../../../illegal_panelinstallation_report.php:57
+#: ../../../panelinstallation_report.php:55
+#: ../../../panelinstallation_report.php:57
+#: ../../../query.php:55
+msgid "Select date"
+msgstr "اختر التاريخ"
+
+#: ../../../authorized_panel_report.php:56
+#: ../../../illegal_panelinstallation_report.php:56
+#: ../../../panelinstallation_report.php:56
+msgid "To Date:"
+msgstr "الى تاريخ:"
+
+#: ../../../authorized_panel_report.php:58
+#: ../../../illegal_panelinstallation_report.php:58
+#: ../../../panelinstallation_report.php:58
+#: ../../../query.php:110
+msgid "Search The Database"
+msgstr "البحث في قاعدة البيانات"
+
+#: ../../../authorized_panel_report.php:94
+#: ../../../print.php:62
+msgid "Ministry of Public Works and Housing"
+msgstr "وزارة الاشغال العامة و الاسكان"
+
+#: ../../../authorized_panel_report.php:95
+#: ../../../panelinstallation_report.php:111
+msgid "Authorized panel list from:"
+msgstr "قائمة اللوحات المرخصة من:"
+
+#: ../../../authorized_panel_report.php:97
+#: ../../../illegal_panelinstallation_report.php:114
+#: ../../../panelinstallation_report.php:113
+msgid " To:"
+msgstr "الى:"
+
+#: ../../../authorized_panel_report.php:98
+#: ../../../illegal_panelinstallation_report.php:115
+#: ../../../panelinstallation_report.php:114
+msgid "District:"
+msgstr "المحافظة:"
+
+#: ../../../illegal_panelinstallation_report.php:29
+msgid "Illegal Panel installation report"
+msgstr "تقرير اللوحات الاعلانية المخالفة"
+
+#: ../../../illegal_panelinstallation_report.php:112
+msgid "Illegal panel list from:"
+msgstr "قائمة اللوحات المخالفة من:"
+
#: ../../../index.php:26
msgid "Ministry of Public works and Housing"
msgstr "وزارة الاشغال العامة و الاسكان"
@@ -148,6 +235,7 @@
msgstr "اضغط على الرابط للمشاهدة على الخريطة"
#: ../../../index.php:58
+#: ../../../panelpage.php:238
msgid "New Data Entry"
msgstr "ادخال معلومات لوحة جديدة"
@@ -410,59 +498,6 @@
msgid "Identify"
msgstr "تعريف"
-#: ../../../panelinstallation_report.php:29
-msgid "Panel installation report"
-msgstr "تقرير تركيب اللوحات"
-
-#: ../../../panelinstallation_report.php:37
-msgid "Panel Installation"
-msgstr "تركيب اللوحة"
-
-#: ../../../panelinstallation_report.php:44
-#: ../../../query.php:76
-#: ../../../query.php:89
-#: ../../../query.php:99
-#: ../../../include/header.php:291
-#: ../../../include/i18n.php:47
-msgid "[Select One]"
-msgstr "[تحرير]"
-
-#: ../../../panelinstallation_report.php:53
-#: ../../../query.php:52
-msgid "District"
-msgstr "المحافظة"
-
-#: ../../../panelinstallation_report.php:54
-msgid "From Date:"
-msgstr "من تاريخ:"
-
-#: ../../../panelinstallation_report.php:55
-#: ../../../panelinstallation_report.php:57
-#: ../../../query.php:55
-msgid "Select date"
-msgstr "اختر التاريخ"
-
-#: ../../../panelinstallation_report.php:56
-msgid "To Date:"
-msgstr "الى تاريخ:"
-
-#: ../../../panelinstallation_report.php:58
-#: ../../../query.php:110
-msgid "Search The Database"
-msgstr "البحث في قاعدة البيانات"
-
-#: ../../../panelinstallation_report.php:105
-msgid "Authorized panel list from:"
-msgstr "قائمة اللوحات المرخصة من:"
-
-#: ../../../panelinstallation_report.php:107
-msgid " To:"
-msgstr "الى:"
-
-#: ../../../panelinstallation_report.php:108
-msgid "District:"
-msgstr "المحافظة:"
-
#: ../../../panelpage.php:38
msgid "Road Advertisment Panel Control"
msgstr "برنامج التحكم باللوحات الاعلانية على الطرق"
@@ -540,10 +575,6 @@
msgid "Hashemite Kingdom of Jordan"
msgstr "المملكة الاردنية الهاشمية"
-#: ../../../print.php:62
-msgid "Ministry of Public Works and Housing"
-msgstr "وزارة الاشغال العامة و الاسكان"
-
#: ../../../print.php:63
msgid "GIS department"
msgstr "قسم نظم المعلومات الجغرافية"
@@ -582,7 +613,7 @@
#: ../../../query.php:116
#: ../../../admin/setup.php:61
-#: ../../../include/dataobject/Public_panel.php:293
+#: ../../../include/dataobject/Public_panel.php:287
msgid "denotes required field"
msgstr "ادخل معلومات الحقول المطلوبة"
@@ -598,6 +629,14 @@
msgid "Panel Types on routes"
msgstr "انواع اللوحات على الطرق"
+#: ../../../reports.php:37
+msgid "Authorized Panel installation"
+msgstr "اللوحات الاعلانية المرخصة"
+
+#: ../../../reports.php:39
+msgid "Illegal Panel installation"
+msgstr "اللوحات الاعلانية المخالفة"
+
#: ../../../admin/setup.php:41
msgid "DCMMS Setup"
msgstr ""
@@ -955,12 +994,11 @@
#: ../../../admin/user_management.php:306
#: ../../../include/header.php:430
#: ../../../include/i18n.php:24
-#: ../../../include/dataobject/Public_panel.php:778
+#: ../../../include/dataobject/Public_panel.php:777
msgid "Action"
msgstr "الاجراء"
#: ../../../admin/user_management.php:321
-#, fuzzy
msgid "yes"
msgstr "نعم"
@@ -1156,8 +1194,9 @@
msgstr "الرجاء الضغط على الرابط لاظهار المعلومات المرتبطة"
#: ../../../include/i18n.php:25
-#: ../../../include/dataobject/Public_panel.php:665
-#: ../../../include/dataobject/Public_panel.php:727
+#: ../../../include/i18n.php:83
+#: ../../../include/dataobject/Public_panel.php:664
+#: ../../../include/dataobject/Public_panel.php:726
msgid "No"
msgstr "لا"
@@ -1166,8 +1205,8 @@
msgstr "غير معروف"
#: ../../../include/i18n.php:27
-#: ../../../include/dataobject/Public_panel.php:665
-#: ../../../include/dataobject/Public_panel.php:727
+#: ../../../include/dataobject/Public_panel.php:664
+#: ../../../include/dataobject/Public_panel.php:726
msgid "Yes"
msgstr "نعم"
@@ -1364,6 +1403,23 @@
msgid "Zarqa"
msgstr "الزرقاء"
+#: ../../../include/i18n.php:79
+#, fuzzy
+msgid "Jan"
+msgstr "تحريك"
+
+#: ../../../include/i18n.php:80
+msgid "Totalarea"
+msgstr "مجموع المساحه م2"
+
+#: ../../../include/i18n.php:81
+msgid "Boolrow"
+msgstr "خارج حرم الطريق"
+
+#: ../../../include/i18n.php:82
+msgid "Sum"
+msgstr "المبالغ المستحقة"
+
#: ../../../include/dataobject/Public_panel.php:138
msgid "Please Enter the X coordinate for the panel."
msgstr "الرجاء ادخال الاحداثية X للوحة"
@@ -1376,444 +1432,435 @@
msgid "Please Enter the receipt date for the panel."
msgstr "الرجاء ادخال تاريخ الوصل المالي."
-#: ../../../include/dataobject/Public_panel.php:147
-msgid "Please Enter the insurance receipt no for the panel."
-msgstr "الرجاء ادخال رقم الوصل المالي للتأمين"
-
-#: ../../../include/dataobject/Public_panel.php:150
-msgid "Please Enter the insurance receipt date for the panel."
-msgstr "الرجاء ادخال تاريخ الوصل المالي للتأمين."
-
-#: ../../../include/dataobject/Public_panel.php:153
+#: ../../../include/dataobject/Public_panel.php:148
msgid "Please Enter the Y coordinate for the panel."
msgstr "الرجاء ادخال الاحداثية Y للوحة."
-#: ../../../include/dataobject/Public_panel.php:155
+#: ../../../include/dataobject/Public_panel.php:150
msgid "Please Enter the distance from the link start."
msgstr "الرجاء ادخال المسافة من اقرب تقاطع."
-#: ../../../include/dataobject/Public_panel.php:157
+#: ../../../include/dataobject/Public_panel.php:152
msgid "The X coordinate should be numeric."
msgstr "الاحداثية X يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:159
+#: ../../../include/dataobject/Public_panel.php:154
msgid "The Y coordinate should be numeric."
msgstr "الاحداثية Y يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:161
+#: ../../../include/dataobject/Public_panel.php:156
msgid "The distance to nearest panel should be numeric."
msgstr "المسافة من اقرب لوحة يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:163
+#: ../../../include/dataobject/Public_panel.php:158
msgid "The distance to nearest link should be numeric."
msgstr "المسافة من اقرب تقاطع يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:165
+#: ../../../include/dataobject/Public_panel.php:160
msgid "The X coordinate to nearest panel should be numeric."
msgstr "احداثية X لاقرب لوحة يجب ان تكون رقم"
-#: ../../../include/dataobject/Public_panel.php:167
+#: ../../../include/dataobject/Public_panel.php:162
msgid "The Y coordinate to nearest panel should be numeric."
msgstr "الاحداثية Y لاقرب لوحة يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:169
+#: ../../../include/dataobject/Public_panel.php:164
msgid "The Carriage width should be numeric."
msgstr "عرض الطريق يحب ان يكون رقم."
-#: ../../../include/dataobject/Public_panel.php:171
+#: ../../../include/dataobject/Public_panel.php:166
msgid "The Shoulder width should be numeric."
msgstr "عرض الكتف يجب ان يكون رقم."
-#: ../../../include/dataobject/Public_panel.php:173
+#: ../../../include/dataobject/Public_panel.php:168
msgid "Please select the panel type and dimension."
msgstr "الرجاء تحديد نوع اللوحة و ابعادها"
-#: ../../../include/dataobject/Public_panel.php:176
+#: ../../../include/dataobject/Public_panel.php:171
msgid "Please select the permission no."
msgstr "الرجاء ادخال رقم الترخيص"
-#: ../../../include/dataobject/Public_panel.php:191
+#: ../../../include/dataobject/Public_panel.php:186
msgid "The image type should be JPG."
msgstr "صيغة الصورة يجب ان تكون JPG"
-#: ../../../include/dataobject/Public_panel.php:195
+#: ../../../include/dataobject/Public_panel.php:190
msgid "The Company name should be only letters."
msgstr "اسم الشركة يجب ان لا يحتوي ارقام"
-#: ../../../include/dataobject/Public_panel.php:197
+#: ../../../include/dataobject/Public_panel.php:192
msgid "The Mother name should be only letters."
msgstr "اسم الام يجب ان لا يحتوي ارقام."
-#: ../../../include/dataobject/Public_panel.php:200
+#: ../../../include/dataobject/Public_panel.php:195
msgid "The National No. should be only numeric."
msgstr "الرقم الوطني يجب ان لا يحتوي حروف."
-#: ../../../include/dataobject/Public_panel.php:202
-#: ../../../include/dataobject/Public_panel.php:204
-#: ../../../include/dataobject/Public_panel.php:206
-#: ../../../include/dataobject/Public_panel.php:210
-#: ../../../include/dataobject/Public_panel.php:212
-#: ../../../include/dataobject/Public_panel.php:214
-#: ../../../include/dataobject/Public_panel.php:216
-#: ../../../include/dataobject/Public_panel.php:218
+#: ../../../include/dataobject/Public_panel.php:197
+#: ../../../include/dataobject/Public_panel.php:199
+#: ../../../include/dataobject/Public_panel.php:201
+#: ../../../include/dataobject/Public_panel.php:205
+#: ../../../include/dataobject/Public_panel.php:207
+#: ../../../include/dataobject/Public_panel.php:209
+#: ../../../include/dataobject/Public_panel.php:211
+#: ../../../include/dataobject/Public_panel.php:213
msgid "The entered value should be only numeric."
msgstr "القيمة المدخلة يجب ان تكون ارقام فقط."
-#: ../../../include/dataobject/Public_panel.php:208
+#: ../../../include/dataobject/Public_panel.php:203
msgid "The Entered value should be numeric."
msgstr "القيمة المدخلة يجب ان تكون ارقام فقط."
-#: ../../../include/dataobject/Public_panel.php:221
+#: ../../../include/dataobject/Public_panel.php:216
+#: ../../../include/dataobject/Public_panel.php:218
+#: ../../../include/dataobject/Public_panel.php:220
#: ../../../include/dataobject/Public_panel.php:223
#: ../../../include/dataobject/Public_panel.php:225
-#: ../../../include/dataobject/Public_panel.php:228
-#: ../../../include/dataobject/Public_panel.php:230
-#: ../../../include/dataobject/Public_panel.php:232
msgid "Please select the panel dimension, the value should not be zero"
msgstr "الرجاء اختيار ابعاد اللوحة.يجب اختيار قيمة من القائمة."
-#: ../../../include/dataobject/Public_panel.php:234
+#: ../../../include/dataobject/Public_panel.php:228
msgid "Please select the panel dimension, the value should not be zero."
msgstr "الرجاء اختيار ابعاد اللوحة.يجب اختيار قيمة من القائمة."
-#: ../../../include/dataobject/Public_panel.php:239
+#: ../../../include/dataobject/Public_panel.php:233
msgid "The Company name should be 125 letters max."
msgstr "اسم الشركة يجب ان لا يتجاوز 125 حرفا"
-#: ../../../include/dataobject/Public_panel.php:241
+#: ../../../include/dataobject/Public_panel.php:235
msgid "The Mother name should be 125 letters max."
msgstr "اسم الام يجب ان لا يتجاوز 125 حرفا"
-#: ../../../include/dataobject/Public_panel.php:244
+#: ../../../include/dataobject/Public_panel.php:238
msgid "The Address should be 125 letters max."
msgstr "العنوان يجب ان لا يتجاوز 125 حرفا"
-#: ../../../include/dataobject/Public_panel.php:246
+#: ../../../include/dataobject/Public_panel.php:240
msgid "The Entered telephone value should 10 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز10 حرف"
-#: ../../../include/dataobject/Public_panel.php:248
+#: ../../../include/dataobject/Public_panel.php:242
msgid "The Entered fax no should 10 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 10حرف"
-#: ../../../include/dataobject/Public_panel.php:250
+#: ../../../include/dataobject/Public_panel.php:244
msgid "The Entered Mobile no should 10 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 10حرف"
-#: ../../../include/dataobject/Public_panel.php:252
+#: ../../../include/dataobject/Public_panel.php:246
msgid "The Entered pobox value should 6 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 6حرفا"
-#: ../../../include/dataobject/Public_panel.php:254
+#: ../../../include/dataobject/Public_panel.php:248
msgid "The Entered Panel subject value should 32 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 32 حرفا"
-#: ../../../include/dataobject/Public_panel.php:256
+#: ../../../include/dataobject/Public_panel.php:250
msgid "The entered number of lanesvalue should be between 1 and 8."
msgstr "عدد المسارب بين 1 و 8"
-#: ../../../include/dataobject/Public_panel.php:258
+#: ../../../include/dataobject/Public_panel.php:252
msgid "The entered number of lanes value should be between 1 and 8."
msgstr "عدد المسارب بين 1 و 8 مسرب"
-#: ../../../include/dataobject/Public_panel.php:261
-#: ../../../include/dataobject/Public_panel.php:263
+#: ../../../include/dataobject/Public_panel.php:255
+#: ../../../include/dataobject/Public_panel.php:257
msgid "The entered shoulder width value should be between 1 and 5."
msgstr "عرض الكتف بين 1 و 5 م"
-#: ../../../include/dataobject/Public_panel.php:266
-#: ../../../include/dataobject/Public_panel.php:268
+#: ../../../include/dataobject/Public_panel.php:260
+#: ../../../include/dataobject/Public_panel.php:262
msgid "The entered carrigeway width value should be between 2 and 5."
msgstr "عرض الطريق بين 2 و 5 م"
+#: ../../../include/dataobject/Public_panel.php:264
+#: ../../../include/dataobject/Public_panel.php:266
#: ../../../include/dataobject/Public_panel.php:270
#: ../../../include/dataobject/Public_panel.php:272
-#: ../../../include/dataobject/Public_panel.php:276
-#: ../../../include/dataobject/Public_panel.php:278
msgid "The entered value should be 7 digits max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 7 احرف"
-#: ../../../include/dataobject/Public_panel.php:274
-#: ../../../include/dataobject/Public_panel.php:286
+#: ../../../include/dataobject/Public_panel.php:268
+#: ../../../include/dataobject/Public_panel.php:280
msgid "The entered value should be 125 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 125 حرفا"
-#: ../../../include/dataobject/Public_panel.php:280
-#: ../../../include/dataobject/Public_panel.php:282
-#: ../../../include/dataobject/Public_panel.php:284
+#: ../../../include/dataobject/Public_panel.php:274
+#: ../../../include/dataobject/Public_panel.php:276
+#: ../../../include/dataobject/Public_panel.php:278
msgid "The entered value should be 10 digits max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 10احرف"
-#: ../../../include/dataobject/Public_panel.php:336
+#: ../../../include/dataobject/Public_panel.php:332
msgid "Company Name:"
msgstr "اسم الشركة:"
-#: ../../../include/dataobject/Public_panel.php:336
+#: ../../../include/dataobject/Public_panel.php:332
msgid "Panel Catagory:"
msgstr "فئة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:337
+#: ../../../include/dataobject/Public_panel.php:333
msgid "Ownership:"
msgstr "تابعية الشركة:"
-#: ../../../include/dataobject/Public_panel.php:338
+#: ../../../include/dataobject/Public_panel.php:334
msgid "National No.:"
msgstr "الرقم الوطني:"
-#: ../../../include/dataobject/Public_panel.php:338
+#: ../../../include/dataobject/Public_panel.php:334
msgid "Mother Name:"
msgstr "اسم الام:"
-#: ../../../include/dataobject/Public_panel.php:339
+#: ../../../include/dataobject/Public_panel.php:335
msgid "Address:"
msgstr "العنوان:"
-#: ../../../include/dataobject/Public_panel.php:339
+#: ../../../include/dataobject/Public_panel.php:335
msgid "Telephone:"
msgstr "رقم الهاتف:"
-#: ../../../include/dataobject/Public_panel.php:339
+#: ../../../include/dataobject/Public_panel.php:335
msgid "Fax No.:"
msgstr "رقم الفاكس:"
-#: ../../../include/dataobject/Public_panel.php:340
+#: ../../../include/dataobject/Public_panel.php:336
msgid "Mobile No.:"
msgstr "رقم المحمول:"
-#: ../../../include/dataobject/Public_panel.php:340
+#: ../../../include/dataobject/Public_panel.php:336
msgid "Post box:"
msgstr "صندوق البريد:"
-#: ../../../include/dataobject/Public_panel.php:341
+#: ../../../include/dataobject/Public_panel.php:337
msgid "Panel Subject:"
msgstr "غرض الاعلان:"
-#: ../../../include/dataobject/Public_panel.php:341
+#: ../../../include/dataobject/Public_panel.php:337
msgid "Route Name:"
msgstr "رقم الطريق:"
-#: ../../../include/dataobject/Public_panel.php:342
+#: ../../../include/dataobject/Public_panel.php:338
msgid "Carrigeway Width"
msgstr "عرض الطريق:"
-#: ../../../include/dataobject/Public_panel.php:342
+#: ../../../include/dataobject/Public_panel.php:338
msgid "Shoulder Width"
msgstr "عرض الكتف:"
-#: ../../../include/dataobject/Public_panel.php:343
+#: ../../../include/dataobject/Public_panel.php:339
msgid "Number Of Lanes:"
msgstr "عدد المسارب:"
-#: ../../../include/dataobject/Public_panel.php:343
+#: ../../../include/dataobject/Public_panel.php:339
msgid "Median Width:"
msgstr "يوجد جزيرة:"
-#: ../../../include/dataobject/Public_panel.php:344
-#: ../../../include/dataobject/Public_panel.php:692
-#: ../../../include/dataobject/Public_panel.php:710
+#: ../../../include/dataobject/Public_panel.php:340
+#: ../../../include/dataobject/Public_panel.php:691
+#: ../../../include/dataobject/Public_panel.php:709
msgid "Date"
msgstr "التاريخ:"
-#: ../../../include/dataobject/Public_panel.php:344
+#: ../../../include/dataobject/Public_panel.php:340
msgid "Panel distnace to route begining:"
msgstr "مسافة اللوحة من اقرب تقاطع:"
-#: ../../../include/dataobject/Public_panel.php:345
+#: ../../../include/dataobject/Public_panel.php:341
msgid "Panel distance to nearest panel:"
msgstr "المسافة من اقرب لوحة:"
-#: ../../../include/dataobject/Public_panel.php:346
+#: ../../../include/dataobject/Public_panel.php:342
msgid "Route Direction:"
msgstr "جانب الطريق:"
-#: ../../../include/dataobject/Public_panel.php:347
+#: ../../../include/dataobject/Public_panel.php:343
msgid "Notes On Location:"
msgstr "ملاحظات عن الموقع:"
-#: ../../../include/dataobject/Public_panel.php:348
+#: ../../../include/dataobject/Public_panel.php:344
msgid "Nearst Panel X:"
msgstr "احداثية X لاقرب لوحة:"
-#: ../../../include/dataobject/Public_panel.php:348
+#: ../../../include/dataobject/Public_panel.php:344
msgid "Nearst Panel Y:"
msgstr "احداثية Y لاقرب لوحة:"
-#: ../../../include/dataobject/Public_panel.php:349
+#: ../../../include/dataobject/Public_panel.php:345
msgid "Light Available"
msgstr "يوجد انارة:"
-#: ../../../include/dataobject/Public_panel.php:349
+#: ../../../include/dataobject/Public_panel.php:345
msgid "Face Count:"
msgstr "عدد الاوجه:"
-#: ../../../include/dataobject/Public_panel.php:350
+#: ../../../include/dataobject/Public_panel.php:346
msgid "Panel Type and Dimension:"
msgstr "نوع اللوحة و ابعادها:"
-#: ../../../include/dataobject/Public_panel.php:351
-#: ../../../include/dataobject/Public_panel.php:697
+#: ../../../include/dataobject/Public_panel.php:347
+#: ../../../include/dataobject/Public_panel.php:696
msgid "Panel Area"
msgstr "مساحة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:351
+#: ../../../include/dataobject/Public_panel.php:347
msgid "Annual Fees:"
msgstr "الرسوم السنوية:"
-#: ../../../include/dataobject/Public_panel.php:352
+#: ../../../include/dataobject/Public_panel.php:348
msgid "Use Fees:"
msgstr "بدل استغلال حرم الطريق"
-#: ../../../include/dataobject/Public_panel.php:353
+#: ../../../include/dataobject/Public_panel.php:349
msgid "Total Fees:"
msgstr "المجموع:"
-#: ../../../include/dataobject/Public_panel.php:353
+#: ../../../include/dataobject/Public_panel.php:349
msgid "Agreed By:"
msgstr "تم الكشف بواسطة:"
-#: ../../../include/dataobject/Public_panel.php:354
+#: ../../../include/dataobject/Public_panel.php:350
msgid "Receipt No.:"
msgstr "رقم الوصل المالي:"
-#: ../../../include/dataobject/Public_panel.php:354
+#: ../../../include/dataobject/Public_panel.php:350
msgid "Receipt Date:"
msgstr "تاريخ الوصل المالي:"
-#: ../../../include/dataobject/Public_panel.php:355
+#: ../../../include/dataobject/Public_panel.php:351
msgid "Insurance Receipt No.:"
msgstr "رقم الوصل المالي للتامين:"
-#: ../../../include/dataobject/Public_panel.php:356
+#: ../../../include/dataobject/Public_panel.php:352
msgid "Insurance Receipt Date:"
msgstr "تاريخ الوصل المالي للتأمين:"
-#: ../../../include/dataobject/Public_panel.php:356
+#: ../../../include/dataobject/Public_panel.php:352
msgid "Contract No:"
msgstr "رقم العطاء:"
-#: ../../../include/dataobject/Public_panel.php:357
+#: ../../../include/dataobject/Public_panel.php:353
msgid "Notes:"
msgstr "ملاحظات:"
-#: ../../../include/dataobject/Public_panel.php:357
+#: ../../../include/dataobject/Public_panel.php:353
msgid "Permission No.:"
msgstr "رقم الترخيص:"
-#: ../../../include/dataobject/Public_panel.php:358
-#: ../../../include/dataobject/Public_panel.php:715
+#: ../../../include/dataobject/Public_panel.php:354
+#: ../../../include/dataobject/Public_panel.php:714
msgid "Registeration No.:"
msgstr "رقم التسجيل:"
-#: ../../../include/dataobject/Public_panel.php:358
+#: ../../../include/dataobject/Public_panel.php:354
msgid "Right of Way"
-msgstr ""
+msgstr "داخل الحرم"
-#: ../../../include/dataobject/Public_panel.php:361
+#: ../../../include/dataobject/Public_panel.php:357
msgid "Advertisement Panel Information Data Entry"
msgstr "ادخال معلومات اللوحات الاعلانية"
-#: ../../../include/dataobject/Public_panel.php:363
+#: ../../../include/dataobject/Public_panel.php:359
#, php-format
msgid "%s: The value you have entered is not valid."
msgstr "%s:القيمة المدخلة غير مقبولة."
-#: ../../../include/dataobject/Public_panel.php:364
+#: ../../../include/dataobject/Public_panel.php:360
#, php-format
msgid "%s: This field is required."
msgstr "%s: يجب ادخال هذا الحقل."
-#: ../../../include/dataobject/Public_panel.php:580
+#: ../../../include/dataobject/Public_panel.php:579
msgid "Select One"
msgstr "اختر واحد"
-#: ../../../include/dataobject/Public_panel.php:658
+#: ../../../include/dataobject/Public_panel.php:657
msgid "Contract"
msgstr "عطاء"
-#: ../../../include/dataobject/Public_panel.php:658
+#: ../../../include/dataobject/Public_panel.php:657
msgid "Private"
msgstr "قطاع خاص"
-#: ../../../include/dataobject/Public_panel.php:658
+#: ../../../include/dataobject/Public_panel.php:657
msgid "Goverment"
msgstr "حكومي"
-#: ../../../include/dataobject/Public_panel.php:664
+#: ../../../include/dataobject/Public_panel.php:663
msgid "Panel catagory"
msgstr "فئة اللوحة"
-#: ../../../include/dataobject/Public_panel.php:672
+#: ../../../include/dataobject/Public_panel.php:671
msgid "Median available"
msgstr "يوجد جزيرة"
-#: ../../../include/dataobject/Public_panel.php:674
+#: ../../../include/dataobject/Public_panel.php:673
msgid "Panel image"
msgstr "صورة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:679
+#: ../../../include/dataobject/Public_panel.php:678
msgid "Panel Area:"
msgstr "مساحة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:681
-#: ../../../include/dataobject/Public_panel.php:699
+#: ../../../include/dataobject/Public_panel.php:680
+#: ../../../include/dataobject/Public_panel.php:698
msgid "Use fees"
msgstr "بدل استغلال حرم الطريق"
-#: ../../../include/dataobject/Public_panel.php:683
-#: ../../../include/dataobject/Public_panel.php:701
+#: ../../../include/dataobject/Public_panel.php:682
+#: ../../../include/dataobject/Public_panel.php:700
msgid "Annualfees"
msgstr "الرسوم السنوية:"
-#: ../../../include/dataobject/Public_panel.php:685
-#: ../../../include/dataobject/Public_panel.php:703
+#: ../../../include/dataobject/Public_panel.php:684
+#: ../../../include/dataobject/Public_panel.php:702
msgid "Total fees"
msgstr "المجموع"
-#: ../../../include/dataobject/Public_panel.php:721
+#: ../../../include/dataobject/Public_panel.php:720
msgid "Total fees:"
msgstr "مجموع الرسوم:"
-#: ../../../include/dataobject/Public_panel.php:727
+#: ../../../include/dataobject/Public_panel.php:726
msgid "Right of Way:"
-msgstr ""
+msgstr "داخل الحرم:"
-#: ../../../include/dataobject/Public_panel.php:770
+#: ../../../include/dataobject/Public_panel.php:769
msgid "ID"
msgstr "رقم التعريف"
-#: ../../../include/dataobject/Public_panel.php:771
+#: ../../../include/dataobject/Public_panel.php:770
msgid "Company name"
msgstr "اسم الشركة"
-#: ../../../include/dataobject/Public_panel.php:772
+#: ../../../include/dataobject/Public_panel.php:771
msgid "National number"
msgstr "الرقم الوطني:"
-#: ../../../include/dataobject/Public_panel.php:773
+#: ../../../include/dataobject/Public_panel.php:772
msgid "Mother name"
msgstr "اسم الام:"
-#: ../../../include/dataobject/Public_panel.php:774
+#: ../../../include/dataobject/Public_panel.php:773
msgid "Address"
msgstr "العنوان:"
-#: ../../../include/dataobject/Public_panel.php:775
+#: ../../../include/dataobject/Public_panel.php:774
msgid "Telephone no."
msgstr "رقم الهاتف:"
-#: ../../../include/dataobject/Public_panel.php:776
+#: ../../../include/dataobject/Public_panel.php:775
msgid "Fax no."
msgstr "رقم الفاكس:"
-#: ../../../include/dataobject/Public_panel.php:777
+#: ../../../include/dataobject/Public_panel.php:776
msgid "Mobile no."
msgstr "رقم المحمول:"
-#: ../../../include/dataobject/Public_panel.php:794
+#: ../../../include/dataobject/Public_panel.php:793
msgid "[View on Map]"
msgstr "[اظهار على الخريطة]"
-#: ../../../include/dataobject/Public_panel.php:800
+#: ../../../include/dataobject/Public_panel.php:799
msgid "[Edit]"
msgstr "[تحرير]"
Modified: trunk/rapc/panelinstallation_report.php
===================================================================
--- trunk/rapc/panelinstallation_report.php 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/panelinstallation_report.php 2006-12-13 05:42:51 UTC (rev 18)
@@ -61,10 +61,10 @@
$strWhere ='';
//print_r($_POST['district']);
if ($_POST['district']!=''){
- $strWhere = $strWhere."where panel.district='".$Queryform->exportvalue('district')."'";
+ $strWhere = $strWhere."where panelinformation.district='".$Queryform->exportvalue('district')."'";
} else {
- $strWhere = $strWhere."where panel.district<>''";
+ $strWhere = $strWhere."where panelinformation.district<>''";
}
if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['M']!=0)&&($_POST['fromdate']['Y']!=0)) {
$strWhere = $strWhere . " and date >=to_date('".$_POST['fromdate']['Y']."-".
@@ -80,7 +80,7 @@
-$strQuery = "select panel.companyname,panel.panelsubject,
+/*$strQuery = "select panel.companyname,panel.panelsubject,
routetype.description as routetype,
panel.routename,
paneldimension.description as dimension,facecount.description as facecount,
@@ -96,7 +96,13 @@
left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension)
left outer join routetype on (routetype.codedvalue=panel.routetype) left outer
join facecount on (facecount.codedvalue=panel.facecount) ".$strWhere;
-
+*/
+$strQuery="select companyname,panelsubject,routetype,routename,dimension,boolrow,
+sum(totalfees),facecount,count(*),usefees,insurance,receiptno,recEiptdate,
+insurancereceiptdate
+from panelinformation ".$strWhere."group by companyname,routename,panelsubject,
+routetype,dimension,facecount,insurance,usefees,receiptno,receiptdate,
+insurancereceiptdate,boolrow";
//print_r($strQuery);
$objTable = new DbTable($DccssPage->postgis->db, $strQuery);
Modified: trunk/rapc/panelpage.php
===================================================================
--- trunk/rapc/panelpage.php 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/panelpage.php 2006-12-13 05:42:51 UTC (rev 18)
@@ -165,8 +165,8 @@
//$date = date();
$objPanelForm = $objPanelBuilder->getForm();
+//print_r($_POST);
-
//$objPanelForm->addElement('file','uploaded_file','Your File:');
if(isset($_REQUEST['id']) && is_numeric($_REQUEST['id'])) {
@@ -233,7 +233,9 @@
$dccssPage->add('<a href="Panelpage.php?PHPSESSID='.session_id().
'&action=map&id='.$objPanel->id.'">'.
- _('View on Map').'</a>');
+ _('View on Map').'</a>');
+ $dccssPage->add('<br><a href="Panelpage.php?PHPSESSID='.session_id().
+ '&type=new">'. _('New Data Entry').'</a>');
$arrResetValues = array( 'panelcatagory','companyname','ownership',
'nationalno', 'mothername',
'address', 'teleno', 'faxno',
@@ -264,7 +266,11 @@
$objStatic->setText('</table></td><td><table>');
$objPanelForm->insertElementBefore($objStatic, 'routedirection');
+$objStatic =& new HTML_QuickForm_static();
+$objStatic->setText('<input type=hidden name=routetypevalue>');
+$objPanelForm->insertElementBefore($objStatic, 'image');
+
$objStatic =& new HTML_QuickForm_static();
$objStatic->setText('</td></tr></table>');
$objPanelForm->addElement($objStatic);
Modified: trunk/rapc/query.php
===================================================================
--- trunk/rapc/query.php 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/query.php 2006-12-13 05:42:51 UTC (rev 18)
@@ -52,7 +52,7 @@
$select=&$Queryform->addElement('select', 'district', _('District'));
$hierselect=&$Queryform->addElement('hierselect', 'Queryroute', _('Query route'));
$Queryform->addElement('date', 'regdate', _('Select Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
$Queryform->addElement('text','companyname',_('Company Name'));
Modified: trunk/rapc/rapc.nsi
===================================================================
--- trunk/rapc/rapc.nsi 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/rapc.nsi 2006-12-13 05:42:51 UTC (rev 18)
@@ -32,7 +32,7 @@
!define DataBase $R2
!define RAPC_PRODUCT "RAPC"
-!define RAPC_VERSION "0.0.1"
+!define RAPC_VERSION "0.5.0"
!define RAPC_PREVIOUS_VERSION "0.0.0"
!define RAPC_PACKAGE "1"
!define PG_VERSION "8.1.2"
Modified: trunk/rapc/reports.php
===================================================================
--- trunk/rapc/reports.php 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/reports.php 2006-12-13 05:42:51 UTC (rev 18)
@@ -33,6 +33,10 @@
_("Panel Installation list").'</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>
+ <li><a href="illegal_panelinstallation_report.php?PHPSESSID=session_id()">'.
+ _("Illegal Panel installation").'</a></li>
</ul>
Modified: trunk/rapc/script/create_views.sql
===================================================================
--- trunk/rapc/script/create_views.sql 2006-11-29 18:14:25 UTC (rev 17)
+++ trunk/rapc/script/create_views.sql 2006-12-13 05:42:51 UTC (rev 18)
@@ -22,6 +22,24 @@
-- Run the script like this:
-- psql -d dccss -f create_views.sql
+create or replace view panelinformation as
+select 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,
+insurance.description as insurance,
+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.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
+join facecount on (facecount.codedvalue=panel.facecount) left outer join yesno on
+(panel.boolrow=yesno.codedvalue)
+grant select on panelinformation to public;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-01-11 11:51:16
|
Revision: 33
http://svn.sourceforge.net/rapc/?rev=33&view=rev
Author: maher_karim
Date: 2007-01-11 03:51:13 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
2007-01-11 Maher Abdel karim <mah...@do...>
* script/create_views.sql:adjust the view to contain the variation info.
* authorized_panel_report.php:Added report.
* reports.php:add more links.
* contract_panel_report.php:
* illegal_panelinstallation_report.php:
* panelinstallation_report.php:Added reports.
* include/i18n.php:
* ar/LC_MESSAGES/rapc.po:adjust translations.
Modified Paths:
--------------
trunk/rapc/changelog
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
Added Paths:
-----------
trunk/rapc/authorized_panel_report.php
trunk/rapc/contract_panel_report.php
trunk/rapc/illegal_panelinstallation_report.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2007-02-05 12:39:31
|
Revision: 40
http://svn.sourceforge.net/rapc/?rev=40&view=rev
Author: maher_karim
Date: 2007-02-05 04:39:28 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
2007-02-05 Maher Abdel karim <mah...@do...>
* doc/user/en/rapc_user_guide.xml:update user guide.
* include/i18n.php:add translation.
* include/dataobject/Public_panel.php:Add more validation.
* authorized_panel_report.php:
* contract_panel_report.php:
* illegal_panelinstallation_report.php:
* map.php:
* panelinstallation_report.php:
* panelpage.php:
* paneltypes_report.php:
* query.php:Adjust the application based on MPWH remarks.
Modified Paths:
--------------
trunk/rapc/authorized_panel_report.php
trunk/rapc/changelog
trunk/rapc/contract_panel_report.php
trunk/rapc/doc/administration/rapc_administration_guide.xml
trunk/rapc/doc/build.xml
trunk/rapc/doc/user/en/rapc_user_guide.xml
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/map.php
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
trunk/rapc/paneltypes_report.php
trunk/rapc/query.php
Modified: trunk/rapc/authorized_panel_report.php
===================================================================
--- trunk/rapc/authorized_panel_report.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/authorized_panel_report.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -46,15 +46,15 @@
//foreach ($row as $field) {
$district=$row[0];
-$select1[$district]=$district;
+$select1[$district]=_($district);
//}
}
$Queryform->addElement('select','district',_('District'),$select1);
-$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
-$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>2020,
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
+$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>2020,
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
$Queryform->addElement('submit', null, _('Search The Database'));
$DccssPage->add($Queryform->tohtml());
@@ -66,14 +66,14 @@
} else {
$strWhere = $strWhere."where panel.district<>''";
}
- if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['M']!=0)&&($_POST['fromdate']['Y']!=0)) {
+ 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')";
+ $_POST['fromdate']['m']."-".$_POST['fromdate']['d']."','YYYY-MM-dd')";
- } elseif (($_POST['todate']['d']!=0)&&($_POST['todate']['M']!=0)&&($_POST['todate']['Y']!=0)){
+ } 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')";
+ $_POST['todate']['m']."-".$_POST['todate']['d']."','YYYY-MM-dd')";
}
@@ -92,10 +92,11 @@
$objTable->addRows();
$numRowCount = $objTable->getRowCount();
$DccssPage->add('<B>'._('Ministry of Public Works and Housing').'<br>');
+ $DccssPage->add('<B>'._('Traffic Safty Directorate-Violation Department').'<br>');
$DccssPage->add('<B>'._('Authorized panel list from:')." ".
$_POST['fromdate']['d']."-".
- $_POST['fromdate']['M']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
- $_POST['todate']['M']."-".$_POST['todate']['Y'].'<br>'._('District:').
+ $_POST['fromdate']['m']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
+ $_POST['todate']['m']."-".$_POST['todate']['Y'].'<br>'._('District:').
$_POST['district'].'</B>');
$strQuery="select district,count(*),sum(totalfees) from panel ".$strWhere."group by district";
@@ -107,9 +108,15 @@
$arrDel[$i] = array($Row[0],$Row[1]);
$arrSub[$i] =$Row[2];
}
-// print_r($strQuery);
+// print_r($strQuery);
+
$DccssPage->add($objTable->toHtml());
-
+$DccssPage->add('<br>');
+$strQuery='select count(*),sum(totalfees) as totalfees,sum(panelarea) as totalarea
+from panel '.$strWhere;
+$objTable = new DbTable($DccssPage->postgis->db, $strQuery);
+$objTable->addRows();
+$DccssPage->add($objTable->toHtml());
require_once 'Image/Graph.php';
// create the graph
@@ -120,7 +127,14 @@
//$Arial_v->setAngle(90);
// set the font size to 11 pixels
//$Font->setSize(10);
+//$Font =& $Graph->addNew('font', 'arial');
+// set the font size to 11 pixels
+//$Font->setSize(8);
+
+//$Graph->setFont($Font);
+
+
//$Graph->setFont($Arial_v);
$Matrix =& $Graph->addNew('Image_Graph_Layout_Matrix', array(2, 2));
// setup the plotarea, legend and their layout
@@ -150,8 +164,8 @@
}
$datasets = array($DatasetDel,$DatasetTotal);
-$datasets[0]->setName(_('Total amount'));
-$datasets[1]->setName(_('Panel count'));
+$datasets[0]->setName(('Total amount'));
+$datasets[1]->setName(('Panel count'));
// create the plot as line chart using the dataset
$Plot =& $Plotarea->addNew('bar', array($datasets[0]));
@@ -226,7 +240,7 @@
}
$datasets = array($DatasetDel2);
-$datasets[0]->setName(_('Total amount'));
+$datasets[0]->setName('Total amount');
// create the plot as line chart using the dataset
@@ -253,6 +267,7 @@
$strTmpPath = tempnam("c:\\tmp\\ms_tmp", "graph").".png";
$Graph->done(array('filename' => $strTmpPath));
$DccssPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />");;
-
+$DccssPage->add('<B><table width=100%><tr><td>'._('Advertisement Section').
+'</td><td>'._('Head of Section').'</td></tr></table><br>');
echo $DccssPage->toHTML();
?>
\ No newline at end of file
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/changelog 2007-02-05 12:39:28 UTC (rev 40)
@@ -1,3 +1,23 @@
+2007-02-05 Maher Abdel karim <mah...@do...>
+
+ * doc/user/en/rapc_user_guide.xml:update user guide.
+ * include/i18n.php:add translation.
+ * include/dataobject/Public_panel.php:Add more validation.
+ * authorized_panel_report.php:
+ * contract_panel_report.php:
+ * illegal_panelinstallation_report.php:
+ * map.php:
+ * panelinstallation_report.php:
+ * panelpage.php:
+ * paneltypes_report.php:
+ * query.php:Adjust the application based on MPWH remarks.
+
+2007-02-04 Maher Abdel karim <mah...@do...>
+
+ * panelpage.php:adjust the myfunction().
+ * include/public_panel.php:adjust the xajax function call.
+ * locale/ar/LC_MESSAGES/rapc.po:Adjust translations.
+
2007-01-11 Maher Abdel karim <mah...@do...>
* script/create_views.sql:adjust the view to contain the variation info.
Modified: trunk/rapc/contract_panel_report.php
===================================================================
--- trunk/rapc/contract_panel_report.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/contract_panel_report.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -46,15 +46,15 @@
//foreach ($row as $field) {
$district=$row[0];
-$select1[$district]=$district;
+$select1[$district]=_($district);
//}
}
$Queryform->addElement('select','district',_('District'),$select1);
-$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
-$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>2020,
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
+$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>2020,
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
$Queryform->addElement('submit', null, _('Search The Database'));
$DccssPage->add($Queryform->tohtml());
@@ -66,14 +66,14 @@
} else {
$strWhere = $strWhere."where panel.district<>'' and contractno<>'' ";
}
- if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['M']!=0)&&($_POST['fromdate']['Y']!=0)) {
+ 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')";
+ $_POST['fromdate']['m']."-".$_POST['fromdate']['d']."','YYYY-MM-dd')";
- } elseif (($_POST['todate']['d']!=0)&&($_POST['todate']['M']!=0)&&($_POST['todate']['Y']!=0)){
+ } 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')";
+ $_POST['todate']['m']."-".$_POST['todate']['d']."','YYYY-MM-dd')";
}
@@ -98,8 +98,8 @@
$DccssPage->add('<B>'._('Ministry of Public Works and Housing').'<br>');
$DccssPage->add('<B>'._('Authorized panel list by contract for the period from:')." ".
$_POST['fromdate']['d']."-".
- $_POST['fromdate']['M']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
- $_POST['todate']['M']."-".$_POST['todate']['Y'].'<br>'._('District:').
+ $_POST['fromdate']['m']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
+ $_POST['todate']['m']."-".$_POST['todate']['Y'].'<br>'._('District:').
$_POST['district'].'</B>');
$DccssPage->add($objTable->toHtml());
Modified: trunk/rapc/doc/administration/rapc_administration_guide.xml
===================================================================
--- trunk/rapc/doc/administration/rapc_administration_guide.xml 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/doc/administration/rapc_administration_guide.xml 2007-02-05 12:39:28 UTC (rev 40)
@@ -585,8 +585,8 @@
<para>Mailing lists are automated distribution systems for
emails.</para>
- <para>Feature request, and bugs can be emailed to
- <email>rap...@li...</email></para>
+ <para>Feature request, and bugs can be sent directly to the following
+ email <email>Mah...@do...</email></para>
<para>The majority of the software products mentioned in this document
offer a multitude of mailing lists to keep users and administrators
@@ -618,8 +618,8 @@
<para>Please report all <citetitle>RAPC</citetitle> installation
problems in order to allow the developers to further enhance the
installation process.</para>
- <para> Any remarks can be sent to
- <email>rap...@li...</email>.</para>
+ <para> Any remarks can be sent directly to the following email <email>
+ Mah...@do...</email></para>
</tip>
@@ -1961,9 +1961,10 @@
<sect2 id="mailing_lists">
<title>RAPC Info Mailing List</title>
- <para>The <citetitle>rapc-info</citetitle> mailing list may provide
+ <para>The <citetitle>RAPC</citetitle> mailing list may provide
help to solve problems, either through the archives which are available
- by sending an email to <email>rap...@li...</email>.</para>
+ by sending an email to
+ <email>Mah...@do...</email>.</para>
</sect2>
Modified: trunk/rapc/doc/build.xml
===================================================================
--- trunk/rapc/doc/build.xml 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/doc/build.xml 2007-02-05 12:39:28 UTC (rev 40)
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
-<!DOCTYPE project PUBLIC "-//ANT//DTD project//EN" "project.dtd" []>
+<!DOCTYPE project PUBLIC "-//ANT//DTD project//EN" "../../../project.dtd" []>
<!-- compile the docbook documentation using ant, saxon, fop and hhc -->
-<project name="RAPC Documentation" basedir="." default="rapc_documentation">
+<project name="RAPC Documentation" basedir="." default="RAPC_Documentation">
<!-- configuration -->
- <!-- Custom stylesheets -->
+ <!-- Custom RAPC stylesheets -->
<property name="stylesheetdir" value="${basedir}" />
<!-- Where docbook-xsl is installed -->
<property name="docbookdir" value="c:/program files/docbook-xsl" />
<!-- location of the saxon.jar -->
- <property name="saxon" value="../lib/saxon.jar" />
+ <property name="saxon" value="../../lib/saxon.jar" />
<!-- Where the HTML Help Workshop is installed -->
<property name="hhc" value="c:/program files/HTML Help Workshop/hhc.exe" />
@@ -21,7 +21,7 @@
<target name="init" id="init">
<taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop">
<classpath>
- <fileset dir="../lib">
+ <fileset dir="../../lib">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -33,8 +33,8 @@
<arg line="-o ${output} ${input} "${stylesheetdir}/${stylesheet}"" />
<classpath>
<!-- include the permissive ASCIICharacterSet class before the real one -->
- <dirset dir="../lib" />
- <filelist dir="${basedir}" files="../lib/saxon.jar"/>
+ <dirset dir="../../lib" />
+ <filelist dir="${basedir}" files="../../lib/saxon.jar"/>
</classpath>
</java>
</target>
@@ -45,7 +45,7 @@
<fileset dir="${dir}" includes="*.html" />
<fileset dir="${dir}" includes="*.hhp" />
<fileset dir="${dir}" includes="*.hhk" />
- <fileset dir="${dir}" includes="*.pdf" excludes="rapc_data_model.pdf" />
+ <fileset dir="${dir}" includes="*.pdf" excludes="RAPC_data_model.pdf" />
<fileset dir="${dir}" includes="*.css" />
</delete>
</target>
@@ -125,7 +125,7 @@
<param name="dir" value="${dir}" />
<param name="input" value="${basename}.xml" />
<param name="output" value="${basename}.fo" />
- <param name="stylesheet" value="rapc_docbook_pdf.xsl" />
+ <param name="stylesheet" value="RAPC_docbook_pdf.xsl" />
</antcall>
<fop format="application/pdf" outdir="${dir}"
messagelevel="warn" basedir="${dir}">
@@ -138,7 +138,7 @@
<param name="dir" value="${dir}" />
<param name="input" value="${basename}.xml" />
<param name="output" value="${basename}.html" />
- <param name="stylesheet" value="rapc_docbook_htmlhelp.xsl" />
+ <param name="stylesheet" value="RAPC_docbook_htmlhelp.xsl" />
</antcall>
<exec dir="${dir}" executable="${hhc}">
<arg line="htmlhelp.hhp"/>
@@ -150,7 +150,7 @@
<param name="dir" value="${dir}" />
<param name="input" value="${basename}.xml" />
<param name="output" value="index.html" />
- <param name="stylesheet" value="rapc_docbook_html.xsl" />
+ <param name="stylesheet" value="RAPC_docbook_html.xsl" />
</antcall>
</target>
@@ -166,7 +166,7 @@
<param name="dir" value="${dir}" />
<param name="input" value="${basename}.xml" />
<param name="output" value="${basename}.html" />
- <param name="stylesheet" value="rapc_docbook_htmlhelp_ar.xsl" />
+ <param name="stylesheet" value="RAPC_docbook_htmlhelp_ar.xsl" />
</antcall>
<echo message="Several Regex replacements in *.html and *.hhp" />
<replaceregexp>
@@ -229,7 +229,7 @@
<param name="dir" value="${dir}" />
<param name="input" value="${basename}.xml" />
<param name="output" value="index.html" />
- <param name="stylesheet" value="rapc_docbook_html_ar.xsl" />
+ <param name="stylesheet" value="RAPC_docbook_html_ar.xsl" />
</antcall>
<replaceregexp file="${dir}/index.html"
match="<th align="left""
@@ -257,10 +257,17 @@
</exec>
</target>
+ <!-- <target name="development_guide" id="development_guide">
+ <antcall target="docbook">
+ <param name="dir" value="${basedir}/development" />
+ <param name="basename" value="RAPC_development_guide" />
+ </antcall>
+ </target> -->
+
<target name="administration_guide" id="administration_guide">
<antcall target="docbook">
<param name="dir" value="${basedir}/administration" />
- <param name="basename" value="rapc_administration_guide" />
+ <param name="basename" value="RAPC_administration_guide" />
</antcall>
</target>
@@ -268,13 +275,23 @@
<echo>English User Guide</echo>
<antcall target="docbook">
<param name="dir" value="${basedir}/user/en" />
- <param name="basename" value="rapc_user_guide" />
+ <param name="basename" value="RAPC_user_guide" />
</antcall>
</target>
- <target name="rapc_documentation" id="rapc_documentation">
+ <!--<target name="user_guide_ar" id="user_guide_ar">
+ <echo>Arabic User Guide</echo>
+ <antcall target="docbook_ar">
+ <param name="dir" value="${basedir}/user/ar" />
+ <param name="basename" value="RAPC_user_guide" />
+ </antcall>
+ </target>-->
+ <target name="RAPC_Documentation" id="RAPC_Documentation">
<antcall target="user_guide" />
- <antcall target="administration_guide" />
+ <!--<antcall target="development_guide" />-->
+ <antcall target="administration_guide" />
+
+ <!--<antcall target="doxygen" />-->
</target>
</project>
Modified: trunk/rapc/doc/user/en/rapc_user_guide.xml
===================================================================
--- trunk/rapc/doc/user/en/rapc_user_guide.xml 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/doc/user/en/rapc_user_guide.xml 2007-02-05 12:39:28 UTC (rev 40)
@@ -5,7 +5,7 @@
<articleinfo>
<title>RAPC User Guide</title>
- <pubdate>$Date: 2006-04-06 22:25:22 +0200 (الخميس, 06 نيسان 2006) $</pubdate>
+ <pubdate>$Date: 2006-11-06 22:25:22$</pubdate>
<copyright>
<year>2006</year>
@@ -339,12 +339,12 @@
from the geodatabase.</para>
<para><citetitle>Shapefile loader</citetitle> load zipped shapefiles
to the geodatabase.</para>
+
+
+
+
</sect1>
- <sect1 id="panelpage.php">
- <title>Road Advertisment Panel Control</title>
- <para>Display RAPC form.</para>
- <!-- TODO: Complete -->
- </sect1>
+
<sect1 id="query.php">
<title>Query</title>
<para> This page allows the user to query the panel table in
@@ -515,9 +515,9 @@
<sect2 id="mailing_list">
<title>RAPC Devel Mailing List</title>
- <para>The <citetitle>rapc-info</citetitle> mailing list may provide
+ <para>The <citetitle>RAPC</citetitle> devel mailing list may provide
help to solve problems by sending an email to
- <email>rap...@li...</email>.</para>
+ <email>Mah...@do...</email>.</para>
</sect2>
Modified: trunk/rapc/illegal_panelinstallation_report.php
===================================================================
--- trunk/rapc/illegal_panelinstallation_report.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/illegal_panelinstallation_report.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -46,15 +46,15 @@
//foreach ($row as $field) {
$district=$row[0];
-$select1[$district]=$district;
+$select1[$district]=_($district);
//}
}
$Queryform->addElement('select','district',_('District'),$select1);
-$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
-$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>2020,
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
+$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>2020,
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
$Queryform->addElement('submit', null, _('Search The Database'));
$DccssPage->add($Queryform->tohtml());
@@ -67,14 +67,14 @@
} else {
$strWhere = $strWhere."where panelinformation.district<>'' and panelinformation.notes like '%مخالف%' ";
}
- if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['M']!=0)&&($_POST['fromdate']['Y']!=0)) {
+ 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')";
+ $_POST['fromdate']['m']."-".$_POST['fromdate']['d']."','YYYY-MM-dd')";
- } elseif (($_POST['todate']['d']!=0)&&($_POST['todate']['M']!=0)&&($_POST['todate']['Y']!=0)){
+ } 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')";
+ $_POST['todate']['m']."-".$_POST['todate']['d']."','YYYY-MM-dd')";
}
@@ -116,8 +116,8 @@
$numRowCount = $objTable->getRowCount();
$DccssPage->add('<B>'._('Illegal panel list from:')." ".
$_POST['fromdate']['d']."-".
- $_POST['fromdate']['M']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
- $_POST['todate']['M']."-".$_POST['todate']['Y'].'<br>'._('District:').
+ $_POST['fromdate']['m']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
+ $_POST['todate']['m']."-".$_POST['todate']['Y'].'<br>'._('District:').
$_POST['district'].'</B>');
$DccssPage->add($objTable->toHtml());
Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/include/dataobject/Public_panel.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -169,7 +169,7 @@
'numeric', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('carrigewaywidth', _('The Carriage width should be numeric.'),
'numeric', null, $_SESSION["strHtmlQuickFormValidation"]);
- $form->addRule('shoulderwidth', _('The Shoulder width should be numeric.'),
+ $form->addRule('shoulderwidth', _('The distance from Shoulder should be numeric.'),
'numeric', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('paneltypedimension', _('Please select the panel type and dimension.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
@@ -258,10 +258,10 @@
$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('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');
@@ -731,9 +731,9 @@
$this->fb_preDefElements['registerno'] = HTML_QuickForm::createElement(
'text', 'registerno', _('Registeration No.:'),array('onclick' =>
- "javascript:xajax_myFunction(this.value);",'onfocus' =>
- "javascript:xajax_myFunction(this.value);",'onblur' =>
- "javascript:xajax_myFunction(this.value);"));
+ " 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' =>
Modified: trunk/rapc/include/i18n.php
===================================================================
--- trunk/rapc/include/i18n.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/include/i18n.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -93,7 +93,10 @@
_("Verificationreceipdate");
_("Verificationreceiptdate");
_("Main");
-
+_("Ministry of Health");
+_("Ministry of Tourisim");
+_("Ministry of Public Works");
+_("Ajlun");
?>
Modified: trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-02-05 12:39:28 UTC (rev 40)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: mpwh\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-01-11 13:44+0200\n"
+"PO-Revision-Date: 2007-02-05 10:34+0200\n"
"Last-Translator: t <t>\n"
"Language-Team: dc <mah...@do...>\n"
"MIME-Version: 1.0\n"
@@ -110,7 +110,7 @@
msgstr "اظهار على الخريطة"
#: ../../../address_confirmation.php:105
-#: ../../../map.php:717
+#: ../../../map.php:731
msgid "Print map"
msgstr "طباعة الخريطة"
@@ -121,7 +121,7 @@
#: ../../../authorized_panel_report.php:29
#: ../../../panelinstallation_report.php:29
msgid "Panel installation report"
-msgstr "تقرير تركيب اللوحات"
+msgstr "تقرير اللوحات الاعلانية المرخصة"
#: ../../../authorized_panel_report.php:37
#: ../../../contract_panel_report.php:37
@@ -199,35 +199,38 @@
msgstr "وزارة الاشغال العامة و الاسكان"
#: ../../../authorized_panel_report.php:95
+msgid "Traffic Safty Directorate-Violation Department"
+msgstr "مديرية السلامة المرورية - قسم التعديات"
+
+#: ../../../authorized_panel_report.php:96
#: ../../../detailed_panelinstallation_report.php:90
-#: ../../../panelinstallation_report.php:111
+#: ../../../panelinstallation_report.php:115
msgid "Authorized panel list from:"
msgstr "قائمة اللوحات المرخصة من:"
-#: ../../../authorized_panel_report.php:97
+#: ../../../authorized_panel_report.php:98
#: ../../../contract_panel_report.php:101
#: ../../../detailed_panelinstallation_report.php:92
#: ../../../illegal_panelinstallation_report.php:119
-#: ../../../panelinstallation_report.php:113
+#: ../../../panelinstallation_report.php:117
msgid " To:"
msgstr "الى:"
-#: ../../../authorized_panel_report.php:98
+#: ../../../authorized_panel_report.php:99
#: ../../../contract_panel_report.php:102
#: ../../../detailed_panelinstallation_report.php:93
#: ../../../illegal_panelinstallation_report.php:120
-#: ../../../panelinstallation_report.php:114
+#: ../../../panelinstallation_report.php:118
msgid "District:"
msgstr "المحافظة:"
-#: ../../../authorized_panel_report.php:153
-#: ../../../authorized_panel_report.php:229
-msgid "Total amount"
-msgstr "المجموع الاجمالي"
+#: ../../../authorized_panel_report.php:270
+msgid "Advertisement Section"
+msgstr "شعبة الاعلانات"
-#: ../../../authorized_panel_report.php:154
-msgid "Panel count"
-msgstr "عدد اللوحات"
+#: ../../../authorized_panel_report.php:271
+msgid "Head of Section"
+msgstr "رئيس القسم"
#: ../../../contract_panel_report.php:29
msgid "Contract Panel installation report"
@@ -278,7 +281,8 @@
msgstr "اضغط على الرابط للمشاهدة على الخريطة"
#: ../../../index.php:58
-#: ../../../panelpage.php:239
+#: ../../../mainpage.php:239
+#: ../../../panelpage.php:241
msgid "New Data Entry"
msgstr "ادخال معلومات لوحة جديدة"
@@ -404,176 +408,206 @@
msgid "Login"
msgstr "دخول"
-#: ../../../map.php:200
+#: ../../../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
+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
#, php-format
msgid "Moving Point %s."
msgstr "تحريك النقطة %s."
-#: ../../../map.php:228
+#: ../../../map.php:242
msgid "Deleted Point."
msgstr "حذف النقطة."
-#: ../../../map.php:228
+#: ../../../map.php:242
msgid " "
msgstr ""
-#: ../../../map.php:228
+#: ../../../map.php:242
msgid "PointID:"
msgstr "رقم النقطة:"
-#: ../../../map.php:228
+#: ../../../map.php:242
msgid "id"
msgstr "رقم النقطة"
-#: ../../../map.php:268
+#: ../../../map.php:282
msgid "NO geocode value returned"
msgstr ""
-#: ../../../map.php:288
+#: ../../../map.php:302
msgid "Moved Panel#."
msgstr "تم تحريك النقطة #"
-#: ../../../map.php:506
+#: ../../../map.php:520
msgid "Legend"
msgstr "المفتاح"
-#: ../../../map.php:528
+#: ../../../map.php:542
msgid "Display the Routes"
msgstr "اظهار الطرق"
-#: ../../../map.php:529
+#: ../../../map.php:543
msgid "Route"
msgstr "الطريق"
-#: ../../../map.php:543
+#: ../../../map.php:557
msgid "Display the Villages"
msgstr "اظهار القرى"
-#: ../../../map.php:544
+#: ../../../map.php:558
msgid "Villages"
msgstr "القرى"
-#: ../../../map.php:558
+#: ../../../map.php:572
msgid "Display the Administrative boundary"
msgstr "اظهار الحدود الادارية"
-#: ../../../map.php:559
+#: ../../../map.php:573
msgid "Administrative boundary"
msgstr "الحدود الادارية"
-#: ../../../map.php:569
+#: ../../../map.php:583
msgid "Landmark"
msgstr "المعالم"
-#: ../../../map.php:577
+#: ../../../map.php:591
msgid "Refresh the map display"
msgstr "تحديث الخريطة"
-#: ../../../map.php:578
+#: ../../../map.php:592
msgid "Redraw Map"
msgstr "اعادة رسم الخريطة"
-#: ../../../map.php:586
+#: ../../../map.php:600
msgid "Zoom to grid"
msgstr "التكبير الى"
-#: ../../../map.php:604
+#: ../../../map.php:618
msgid "Select the map size from the list."
msgstr "اختيار ابعاد الخريطة من القائمة."
-#: ../../../map.php:605
+#: ../../../map.php:619
msgid "Map Size"
msgstr "حجم الخريطة"
-#: ../../../map.php:631
+#: ../../../map.php:645
msgid "From Point:"
msgstr "من النقطة:"
-#: ../../../map.php:634
+#: ../../../map.php:648
msgid "To Point:"
msgstr "الى النقطة:"
-#: ../../../map.php:637
+#: ../../../map.php:651
msgid "Distance:"
msgstr "المسافة بين النقطتين:"
-#: ../../../map.php:640
+#: ../../../map.php:654
msgid "Find distance"
msgstr "ايجاد المسافة"
-#: ../../../map.php:660
+#: ../../../map.php:674
msgid "Keymap"
msgstr "الخريطة العامة"
-#: ../../../map.php:664
+#: ../../../map.php:678
msgid "Click on the key map to view an area."
msgstr "اضغط على الخريطة العامة للتكبير الى منطقة."
-#: ../../../map.php:675
+#: ../../../map.php:689
msgid "Zoom in further to display more detailed map information."
msgstr "التكبير اكثر لاظهار تفاصيل اكثر."
-#: ../../../map.php:677
+#: ../../../map.php:691
msgid "Zoom In"
msgstr "تكبير"
-#: ../../../map.php:685
+#: ../../../map.php:699
msgid "Zoom out to display a larger area of the map."
msgstr "التصغير لاظهار تفاصيل اقل."
-#: ../../../map.php:687
+#: ../../../map.php:701
msgid "Zoom Out"
msgstr "تصغير"
-#: ../../../map.php:695
+#: ../../../map.php:709
msgid "Move the map view without zooming in or out."
msgstr "التنقل عبر الخريطة بدون تكبير او تصغير."
-#: ../../../map.php:697
+#: ../../../map.php:711
msgid "Pan"
msgstr "تحريك"
-#: ../../../map.php:705
+#: ../../../map.php:719
msgid "Display information about elements in the map."
msgstr "اظهار معلومات حول عناصر الخريطة."
-#: ../../../map.php:707
+#: ../../../map.php:721
msgid "Identify"
msgstr "تعريف"
-#: ../../../panelpage.php:38
-msgid "Road Advertisment Panel Control"
-msgstr "برنامج التحكم باللوحات الاعلانية على الطرق"
+#: ../../../panelinstallation_report.php:110
+msgid "Unkown"
+msgstr "غير محدد"
-#: ../../../panelpage.php:91
-msgid "FATAL ERROR: No id provided in request."
-msgstr ""
+#: ../../../panelinstallation_report.php:122
+msgid "Responsible Engineer"
+msgstr "المهندس المسؤول:"
-#: ../../../panelpage.php:148
-msgid "Panel #"
-msgstr "رقم اللوحة"
+#: ../../../panelinstallation_report.php:124
+msgid "Public Works Office for:"
+msgstr "مكتب اشغال محافظة:"
-#: ../../../panelpage.php:151
-#: ../../../panelpage.php:237
-msgid "View on Map"
-msgstr "اظهار على الخريطة"
+#: ../../../panelinstallation_report.php:124
+#: ../../../panelinstallation_report.php:125
+#: ../../../print.php:65
+msgid "Date:"
+msgstr "التاريخ:"
-#: ../../../panelpage.php:158
-msgid "Please refer to RIS information to complete road information."
-msgstr "يرجى الرجوع الى نظام RIS لاستكمال معلومات الطريق و التأكد منها."
+#: ../../../panelpage.php:38
+msgid "Road Advertisment Panel Control"
+msgstr "برنامج التحكم باللوحات الاعلانية على الطرق"
-#: ../../../panelpage.php:217
-msgid "Failed to save record(s)."
-msgstr "لم يتم حفظ الشجلات."
-
-#: ../../../panelpage.php:226
-msgid "Image is loaded"
-msgstr "تم تحميل الصورة"
-
-#: ../../../panelpage.php:233
-msgid "Record(s) successfully saved."
-msgstr "تمت عملية حفظ السجلات بنجاح."
-
#: ../../../paneltypes_report.php:36
msgid "Panel types Report"
msgstr "تقرير انواع اللوحات الاعلانية."
@@ -602,14 +636,6 @@
msgid "To"
msgstr "الى"
-#: ../../../paneltypes_report.php:118
-msgid "Advertisement"
-msgstr "لوحة اعلانية"
-
-#: ../../../paneltypes_report.php:119
-msgid "Guide panels"
-msgstr "لوحة ارشادية"
-
#: ../../../print.php:38
msgid "Map printing"
msgstr "طباعة الخريطة"
@@ -622,10 +648,6 @@
msgid "GIS department"
msgstr "قسم نظم المعلومات الجغرافية"
-#: ../../../print.php:65
-msgid "Date:"
-msgstr "التاريخ:"
-
#: ../../../query.php:45
msgid "Routes"
msgstr "الطرق"
@@ -652,7 +674,7 @@
#: ../../../query.php:56
msgid "Company Name"
-msgstr "اسم الشركة"
+msgstr "اسم الجهة الطالبة"
#: ../../../query.php:116
#: ../../../admin/setup.php:61
@@ -1264,11 +1286,11 @@
#: ../../../include/i18n.php:28
#: ../../../include/i18n.php:78
msgid "Companyname"
-msgstr "اسم الشركة"
+msgstr "اسم الجهة الطالبة"
#: ../../../include/i18n.php:29
msgid "Count"
-msgstr "العدد"
+msgstr "عدد اللوحات"
#: ../../../include/i18n.php:30
msgid "Panelsubject"
@@ -1292,7 +1314,7 @@
#: ../../../include/i18n.php:35
msgid "Totalfees"
-msgstr "المجموع"
+msgstr "مجموع الرسوم"
#: ../../../include/i18n.php:36
msgid "Usefees"
@@ -1339,6 +1361,7 @@
msgstr "يمين"
#: ../../../include/i18n.php:48
+#: ../../../include/i18n.php:95
msgid "Main"
msgstr "رئيسي"
@@ -1407,6 +1430,7 @@
msgstr "المسافة المقاسة"
#: ../../../include/i18n.php:66
+#: ../../../include/i18n.php:99
msgid "Ajlun"
msgstr "عجلون"
@@ -1512,6 +1536,18 @@
msgid "Verificationreceiptdate"
msgstr "تاريخ الوصل المالي للتصويب"
+#: ../../../include/i18n.php:96
+msgid "Ministry of Health"
+msgstr "وزارة الصحة"
+
+#: ../../../include/i18n.php:97
+msgid "Ministry of Tourisim"
+msgstr "وزارة السياحة"
+
+#: ../../../include/i18n.php:98
+msgid "Ministry of Public Works"
+msgstr "وزارة الاشغال العامة و الاسكان"
+
#: ../../../include/dataobject/Public_panel.php:144
msgid "Please Enter the X coordinate for the panel."
msgstr "الرجاء ادخال الاحداثية X للوحة"
@@ -1561,8 +1597,8 @@
msgstr "عرض الطريق يحب ان يكون رقم."
#: ../../../include/dataobject/Public_panel.php:172
-msgid "The Shoulder width should be numeric."
-msgstr "عرض الكتف يجب ان يكون رقم."
+msgid "The distance from Shoulder should be numeric."
+msgstr "بعد اللوحة عن كتف الطريق يجب ان يكون رقم."
#: ../../../include/dataobject/Public_panel.php:174
msgid "Please select the panel type and dimension."
@@ -1655,11 +1691,6 @@
msgid "The entered number of lanes value should be between 1 and 8."
msgstr "عدد المسارب بين 1 و 8 مسرب"
-#: ../../../include/dataobject/Public_panel.php:261
-#: ../../../include/dataobject/Public_panel.php:263
-msgid "The entered shoulder width value should be between 1 and 5."
-msgstr "عرض الكتف بين 1 و 5 م"
-
#: ../../../include/dataobject/Public_panel.php:266
#: ../../../include/dataobject/Public_panel.php:268
msgid "The entered carrigeway width value should be between 2 and 5."
@@ -1685,7 +1716,7 @@
#: ../../../include/dataobject/Public_panel.php:339
msgid "Company Name:"
-msgstr "اسم الشركة:"
+msgstr "اسم الجهة الطالبة:"
#: ../../../include/dataobject/Public_panel.php:339
msgid "Panel Catagory:"
@@ -1737,7 +1768,7 @@
#: ../../../include/dataobject/Public_panel.php:345
msgid "Shoulder Width"
-msgstr "عرض الكتف:"
+msgstr "بعد اللوحة الاعلانية عن حافة كتف الطريق:"
#: ../../../include/dataobject/Public_panel.php:346
msgid "Number Of Lanes:"
@@ -1938,7 +1969,7 @@
#: ../../../include/dataobject/Public_panel.php:789
msgid "Company name"
-msgstr "اسم الشركة"
+msgstr "اسم الجهة الطالبة"
#: ../../../include/dataobject/Public_panel.php:790
msgid "National number"
Modified: trunk/rapc/map.php
===================================================================
--- trunk/rapc/map.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/map.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -180,14 +180,28 @@
$Risultato=$QueryResult->shapeindex;
$objLayer->open();
$Shape=$objLayer->getShape(0,$Risultato);
- // print_r ($Shape->values);
+ //$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->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);
+
-
$objImage=$gpoMap->draw();
} else {
Modified: trunk/rapc/panelinstallation_report.php
===================================================================
--- trunk/rapc/panelinstallation_report.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/panelinstallation_report.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -3,7 +3,7 @@
*
* panelinstallation_report.php - Panel installation report.
*
- * Copyright (C) 2006 DORSCH Consult
+ * Copyright (C) 2006,2007 DORSCH Consult
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -46,15 +46,15 @@
//foreach ($row as $field) {
$district=$row[0];
-$select1[$district]=$district;
+$select1[$district]=_($district);
//}
}
$Queryform->addElement('select','district',_('District'),$select1);
-$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
-$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>date("Y"),
-'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>2020,
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
+$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>2020,
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
$Queryform->addElement('submit', null, _('Search The Database'));
$DccssPage->add($Queryform->tohtml());
@@ -66,14 +66,14 @@
} else {
$strWhere = $strWhere."where panelinformation.district<>''";
}
- if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['M']!=0)&&($_POST['fromdate']['Y']!=0)) {
+ 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')";
+ $_POST['fromdate']['m']."-".$_POST['fromdate']['d']."','YYYY-MM-dd')";
- } elseif (($_POST['todate']['d']!=0)&&($_POST['todate']['M']!=0)&&($_POST['todate']['Y']!=0)){
+ } 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')";
+ $_POST['todate']['m']."-".$_POST['todate']['d']."','YYYY-MM-dd')";
}
@@ -104,17 +104,24 @@
routetype,dimension,facecount,insurance,usefees,receiptno,receiptdate,
insurancereceiptdate,boolrow,registerno,insurancereceiptno,date";
//print_r($strQuery);
-
+if ($Queryform->exportvalue('district')!=0){
+ $strDistrict = $Queryform->exportvalue('district');
+} else {
+ $strDistrict = _('Unkown');
+}
$objTable = new DbTable($DccssPage->postgis->db, $strQuery);
$objTable->addRows();
$numRowCount = $objTable->getRowCount();
$DccssPage->add('<B>'._('Authorized panel list from:')." ".
$_POST['fromdate']['d']."-".
- $_POST['fromdate']['M']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
- $_POST['todate']['M']."-".$_POST['todate']['Y'].'<br>'._('District:').
- $_POST['district'].'</B>');
+ $_POST['fromdate']['m']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
+ $_POST['todate']['m']."-".$_POST['todate']['Y'].'<br>'._('District:').
+ _($strDistrict).'</B>');
$DccssPage->add($objTable->toHtml());
-
+$DccssPage->add('<br><table width=100%><tr><td>'._('Responsible Engineer').'</td><td>
+</td><td>'.
+_('Public Works Office for:')._($strDistrict).'</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/panelpage.php
===================================================================
--- trunk/rapc/panelpage.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/panelpage.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -104,25 +104,27 @@
$strQuery="select companyname,mothername,nationalno,address,teleno,faxno,pobox
from panel where registerno='".$arg."'";
$objResult=pg_query($strQuery);
+ $objResponse = new xajaxResponse();
- $arrRow = pg_fetch_row($objResult);
-
-
-
- // Instantiate the xajaxResponse object
- $objResponse = new xajaxResponse();
-
- // 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].'');
+ 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].'');
$objResponse->addAssign("mothername","value",''.$arrRow[1].'');
$objResponse->addAssign("nationalno","value",''.$arrRow[2].'');
$objResponse->addAssign("address","value",''.$arrRow[3].'');
- $objResponse->addAssign("teleno","value",''.$arrRow[4].'');
- $objResponse->addAssign("faxno","value",''.$arrRow[5].'');
- $objResponse->addAssign("pobox","value",''.$arrRow[6].'');
- //return the xajaxResponse object
- return $objResponse;
+ $objResponse->addAssign("teleno","value",''.$arrRow[4].'');
+ $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>');
Modified: trunk/rapc/paneltypes_report.php
===================================================================
--- trunk/rapc/paneltypes_report.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/paneltypes_report.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -34,17 +34,17 @@
//$form->setDefaults(array('FromDate' => array('d'=>date("d"),'M'=>date("m"),'Y'=>date("Y"))));
$form->addElement('header', _('Panel types Report'), _('Panel types per route Report'));
-$form->addElement('date', 'FromDate', _('Select From Date'),array('maxYear'=>date("Y")));
-$form->addElement('date', 'ToDate', _('Select To Date'),array('maxYear'=>date("Y")));
+$form->addElement('date', 'FromDate', _('Select From Date'),array('maxYear'=>2020,'format'=>'dmY'));
+$form->addElement('date', 'ToDate', _('Select To Date'),array('maxYear'=>2020,'format'=>'dmY'));
$form->addElement('submit', 'btnSubmit', 'Submit');
$DccssPage->add($form->toHTML());
$strWhere='';
if (($form->exportValue('FromDate')!='')){
- $strFromDate = $_POST['FromDate']['Y'].'/'.$_POST['FromDate']['M'].'/'.
+ $strFromDate = $_POST['FromDate']['Y'].'/'.$_POST['FromDate']['m'].'/'.
$_POST['FromDate']['d']." 01:01";
- $strToDate = $_POST['ToDate']['Y'].'/'.$_POST['ToDate']['M'].'/'.
+ $strToDate = $_POST['ToDate']['Y'].'/'.$_POST['ToDate']['m'].'/'.
$_POST['ToDate']['d']." 23:59";
$strWhere = " where panel.date >='".$strFromDate.
"' and panel.date <= '".$strToDate."'";
@@ -92,7 +92,7 @@
// setup the plotarea, legend and their layout
$Graph->add(
Image_Graph::vertical(
- Image_Graph::factory('title', array('Advertisement Panels per route', 12)),
+ Image_Graph::factory('title', array(('Advertisement Panels per route'), 12)),
Image_Graph::vertical(
$Plotarea = Image_Graph::factory('plotarea'),
$Legend = Image_Graph::factory('legend'),
@@ -115,8 +115,8 @@
$DatasetSub->addpoint($arrSub[$i][0],$arrSub[$i][1]);
}
$datasets = array($DatasetDel,$DatasetSub);
-$datasets[0]->setName(_('Advertisement'));
-$datasets[1]->setName(_('Guide panels'));
+$datasets[0]->setName(('Advertisement'));
+$datasets[1]->setName(('Guide panels'));
// create the plot as line chart using the dataset
$Plot =& $Plotarea->addNew('bar', array($datasets));
$Plot->setLineColor('gray');
Modified: trunk/rapc/query.php
===================================================================
--- trunk/rapc/query.php 2007-02-05 12:29:03 UTC (rev 39)
+++ trunk/rapc/query.php 2007-02-05 12:39:28 UTC (rev 40)
@@ -51,7 +51,7 @@
$Queryform->addElement('header', null, _('Query Panel Information'));
$select=&$Queryform->addElement('select', 'district', _('District'));
$hierselect=&$Queryform->addElement('hierselect', 'Queryroute', _('Query route'));
-$Queryform->addElement('date', 'regdate', _('Select Date:'),array('maxYear'=>date("Y"),
+$Queryform->addElement('date', 'regdate', _('Select Date:'),array('maxYear'=>2020,
'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date'),'format'=>'dmY'));
$Queryform->addElement('text','companyname',_('Company Name'));
@@ -78,7 +78,7 @@
//foreach ($row as $field) {
$district=$row[0];
-$select1[$district]=$district;
+$select1[$district]=_($district);
//}
}
@@ -136,18 +136,18 @@
}
$boolWhere=true;
}
- if (($_POST['regdate']['d']!=0)&&($_POST['regdate']['M']!=0)&&($_POST['regdate']['Y']!=0)) {
+ if (($_POST['regdate']['d']!=0)&&($_POST['regdate']['m']!=0)&&($_POST['regdate']['Y']!=0)) {
if ($boolWhere){
$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']['m']." and date_part('year',date)=".
$_POST['regdate']['Y'];
} else{
$strWhere = $strWhere." where date_part('day',date)=".
$_POST['regdate']['d']." and date_part('month',date)=".
- $_POST['regdate']['M']." and date_part('year',date)=".
+ $_POST['regdate']['m']." and date_part('year',date)=".
$_POST['regdate']['Y'];
}
}
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...> - 2006-10-16 08:10:55
|
Revision: 5
http://svn.sourceforge.net/rapc/?rev=5&view=rev
Author: maher_karim
Date: 2006-10-16 01:00:16 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
add doc
Added Paths:
-----------
trunk/rapc/doc/
trunk/rapc/doc/administration/
trunk/rapc/doc/administration/docbook.css
trunk/rapc/doc/administration/figure/
trunk/rapc/doc/administration/figure/administrative_tools_icon.png
trunk/rapc/doc/administration/figure/apache_information.png
trunk/rapc/doc/administration/figure/apache_install.png
trunk/rapc/doc/administration/figure/apache_license.png
trunk/rapc/doc/administration/figure/apache_location.png
trunk/rapc/doc/administration/figure/apache_readme.png
trunk/rapc/doc/administration/figure/apache_setup_type.png
trunk/rapc/doc/administration/figure/apache_wizard.png
trunk/rapc/doc/administration/figure/client_server_deployment.BMP
trunk/rapc/doc/administration/figure/client_server_deployment.png
trunk/rapc/doc/administration/figure/client_server_deployment.svg
trunk/rapc/doc/administration/figure/control_panel.png
trunk/rapc/doc/administration/figure/dccss_components.PNG
trunk/rapc/doc/administration/figure/dccss_database_connection.png
trunk/rapc/doc/administration/figure/dccss_license.png
trunk/rapc/doc/administration/figure/dccss_location.png
trunk/rapc/doc/administration/figure/dccss_uml.png
trunk/rapc/doc/administration/figure/dccss_uml.vsd
trunk/rapc/doc/administration/figure/gis_data_review.png
trunk/rapc/doc/administration/figure/internet_deployment.png
trunk/rapc/doc/administration/figure/internet_deployment.svg
trunk/rapc/doc/administration/figure/php_components.png
trunk/rapc/doc/administration/figure/php_license.png
trunk/rapc/doc/administration/figure/php_location.png
trunk/rapc/doc/administration/figure/poedit_php_parser.png
trunk/rapc/doc/administration/figure/poedit_php_path.png
trunk/rapc/doc/administration/figure/postgis_components.png
trunk/rapc/doc/administration/figure/postgis_database_connection.png
trunk/rapc/doc/administration/figure/postgis_installation_complete.png
trunk/rapc/doc/administration/figure/postgis_license.png
trunk/rapc/doc/administration/figure/postgis_location.png
trunk/rapc/doc/administration/figure/postgis_patience.png
trunk/rapc/doc/administration/figure/postgis_reboot.png
trunk/rapc/doc/administration/figure/postgresql_account_error.png
trunk/rapc/doc/administration/figure/postgresql_contrib_modules.png
trunk/rapc/doc/administration/figure/postgresql_database_cluster.png
trunk/rapc/doc/administration/figure/postgresql_enable_postgis.png
trunk/rapc/doc/administration/figure/postgresql_installation_complete.png
trunk/rapc/doc/administration/figure/postgresql_installation_notes.png
trunk/rapc/doc/administration/figure/postgresql_installation_options.png
trunk/rapc/doc/administration/figure/postgresql_installation_ready.png
trunk/rapc/doc/administration/figure/postgresql_language_selection.png
trunk/rapc/doc/administration/figure/postgresql_log_on_as_service.png
trunk/rapc/doc/administration/figure/postgresql_password.png
trunk/rapc/doc/administration/figure/postgresql_procedural_languages.png
trunk/rapc/doc/administration/figure/postgresql_service_configuration.png
trunk/rapc/doc/administration/figure/postgresql_users.png
trunk/rapc/doc/administration/figure/postgresql_welcome.png
trunk/rapc/doc/administration/figure/postmaster_service.png
trunk/rapc/doc/administration/figure/postmaster_service_logon.png
trunk/rapc/doc/administration/figure/postmaster_service_properties.png
trunk/rapc/doc/administration/figure/rapc_components.PNG
trunk/rapc/doc/administration/figure/rapc_database_connection.png
trunk/rapc/doc/administration/figure/rapc_location.png
trunk/rapc/doc/administration/figure/rapc_uml.png
trunk/rapc/doc/administration/figure/rapc_uml.vsd
trunk/rapc/doc/administration/figure/service_start.png
trunk/rapc/doc/administration/figure/service_stop.png
trunk/rapc/doc/administration/figure/services_context_menu.png
trunk/rapc/doc/administration/figure/services_icon.png
trunk/rapc/doc/administration/figure/standalone_deployment.png
trunk/rapc/doc/administration/figure/standalone_deployment.svg
trunk/rapc/doc/administration/figure/uml_legend.png
trunk/rapc/doc/administration/figure/windows_users.png
trunk/rapc/doc/administration/figure/windows_users.svg
trunk/rapc/doc/administration/images/
trunk/rapc/doc/administration/images/blank.png
trunk/rapc/doc/administration/images/callouts/
trunk/rapc/doc/administration/images/callouts/1.png
trunk/rapc/doc/administration/images/callouts/10.png
trunk/rapc/doc/administration/images/callouts/11.png
trunk/rapc/doc/administration/images/callouts/12.png
trunk/rapc/doc/administration/images/callouts/13.png
trunk/rapc/doc/administration/images/callouts/14.png
trunk/rapc/doc/administration/images/callouts/15.png
trunk/rapc/doc/administration/images/callouts/2.png
trunk/rapc/doc/administration/images/callouts/3.png
trunk/rapc/doc/administration/images/callouts/4.png
trunk/rapc/doc/administration/images/callouts/5.png
trunk/rapc/doc/administration/images/callouts/6.png
trunk/rapc/doc/administration/images/callouts/7.png
trunk/rapc/doc/administration/images/callouts/8.png
trunk/rapc/doc/administration/images/callouts/9.png
trunk/rapc/doc/administration/images/caution.png
trunk/rapc/doc/administration/images/caution.svg
trunk/rapc/doc/administration/images/draft.png
trunk/rapc/doc/administration/images/example.png
trunk/rapc/doc/administration/images/home.png
trunk/rapc/doc/administration/images/home.svg
trunk/rapc/doc/administration/images/important.png
trunk/rapc/doc/administration/images/important.svg
trunk/rapc/doc/administration/images/next.png
trunk/rapc/doc/administration/images/next.svg
trunk/rapc/doc/administration/images/note.png
trunk/rapc/doc/administration/images/note.svg
trunk/rapc/doc/administration/images/prev.png
trunk/rapc/doc/administration/images/prev.svg
trunk/rapc/doc/administration/images/tip.png
trunk/rapc/doc/administration/images/tip.svg
trunk/rapc/doc/administration/images/toc-blank.png
trunk/rapc/doc/administration/images/toc-minus.png
trunk/rapc/doc/administration/images/toc-plus.png
trunk/rapc/doc/administration/images/up.png
trunk/rapc/doc/administration/images/up.svg
trunk/rapc/doc/administration/images/warning.svg
trunk/rapc/doc/administration/rapc_administration_guide.xml
trunk/rapc/doc/administration/toc.hhc
trunk/rapc/doc/build.xml
trunk/rapc/doc/dccss_docbook_html.xsl
trunk/rapc/doc/dccss_docbook_htmlhelp.xsl
trunk/rapc/doc/dccss_docbook_pdf.xsl
trunk/rapc/doc/dcmms.xsl
trunk/rapc/doc/development/
trunk/rapc/doc/docbook.css
trunk/rapc/doc/rapc_docbook_html.xsl
trunk/rapc/doc/rapc_docbook_htmlhelp.xsl
trunk/rapc/doc/rapc_docbook_pdf.xsl
trunk/rapc/doc/user/
trunk/rapc/doc/user/ar/
trunk/rapc/doc/user/en/
trunk/rapc/doc/user/en/docbook.css
trunk/rapc/doc/user/en/figure/
trunk/rapc/doc/user/en/figure/error_page_cannot_be_displayed.png
trunk/rapc/doc/user/en/figure/stock-tool-move.png
trunk/rapc/doc/user/en/figure/stock_extended-help.png
trunk/rapc/doc/user/en/figure/stock_zoom-in.png
trunk/rapc/doc/user/en/figure/stock_zoom-out.png
trunk/rapc/doc/user/en/images/
trunk/rapc/doc/user/en/images/blank.png
trunk/rapc/doc/user/en/images/callouts/
trunk/rapc/doc/user/en/images/callouts/1.png
trunk/rapc/doc/user/en/images/callouts/10.png
trunk/rapc/doc/user/en/images/callouts/11.png
trunk/rapc/doc/user/en/images/callouts/12.png
trunk/rapc/doc/user/en/images/callouts/13.png
trunk/rapc/doc/user/en/images/callouts/14.png
trunk/rapc/doc/user/en/images/callouts/15.png
trunk/rapc/doc/user/en/images/callouts/2.png
trunk/rapc/doc/user/en/images/callouts/3.png
trunk/rapc/doc/user/en/images/callouts/4.png
trunk/rapc/doc/user/en/images/callouts/5.png
trunk/rapc/doc/user/en/images/callouts/6.png
trunk/rapc/doc/user/en/images/callouts/7.png
trunk/rapc/doc/user/en/images/callouts/8.png
trunk/rapc/doc/user/en/images/callouts/9.png
trunk/rapc/doc/user/en/images/caution.png
trunk/rapc/doc/user/en/images/caution.svg
trunk/rapc/doc/user/en/images/draft.png
trunk/rapc/doc/user/en/images/example.png
trunk/rapc/doc/user/en/images/home.png
trunk/rapc/doc/user/en/images/home.svg
trunk/rapc/doc/user/en/images/important.png
trunk/rapc/doc/user/en/images/important.svg
trunk/rapc/doc/user/en/images/next.png
trunk/rapc/doc/user/en/images/next.svg
trunk/rapc/doc/user/en/images/note.png
trunk/rapc/doc/user/en/images/note.svg
trunk/rapc/doc/user/en/images/prev.png
trunk/rapc/doc/user/en/images/prev.svg
trunk/rapc/doc/user/en/images/tip.png
trunk/rapc/doc/user/en/images/tip.svg
trunk/rapc/doc/user/en/images/toc-blank.png
trunk/rapc/doc/user/en/images/toc-minus.png
trunk/rapc/doc/user/en/images/toc-plus.png
trunk/rapc/doc/user/en/images/up.png
trunk/rapc/doc/user/en/images/up.svg
trunk/rapc/doc/user/en/images/warning.svg
trunk/rapc/doc/user/en/rapc_user_guide.xml
trunk/rapc/doc/user/en/toc.hhc
Added: trunk/rapc/doc/administration/docbook.css
===================================================================
--- trunk/rapc/doc/administration/docbook.css (rev 0)
+++ trunk/rapc/doc/administration/docbook.css 2006-10-16 08:00:16 UTC (rev 5)
@@ -0,0 +1,566 @@
+/* css 2.0 stylesheet for DocBook generated XHTML */
+/* (c) 2002 e-novative GmbH. */
+/* http://www.e-novative.de */
+/* (c) 2005 DORSCH Consult */
+/* http://www.dorsch.de */
+
+/* Note that due to different browser interpretation of the standards, the */
+/* html pages still do not look exactly the same on every browser and system */
+
+/* This css file formats the html generated by the eDE */
+/* Please modify this file according to your personal preferences. */
+
+/* In many spots, this file is not too well-documented currently. However, */
+/* we will improve documentation over the time */
+
+/* basic settings for the document body, some elements inherit from these */
+
+div.author {
+ text-align: center;
+ display: block;
+}
+
+div.author h3 {
+ display: inline;
+ text-align: center;
+}
+
+body
+{
+ /* foreground color = black */
+ color: #000;
+
+ /* background-color = white */
+ background-color: #fff;
+
+ /* center the body content in browser window */
+ /* Note: this is different from text-align */
+ /* margin depends on browser window width */
+ margin: auto;
+
+ /* padding ("inner margin") leaves space between */
+ /* browser window border and html body content */
+ padding: 24px;
+
+ /* width depends on browser window width */
+ width: auto;
+
+ /* text-alignment */
+ /* alternative: left */
+ text-align: justify;
+}
+
+
+/* set font for most elements */
+/* p: paragraphs (regular text, docbook <para>) */
+/* (...) */
+/* body: anything else */
+body, p, td, li, dt, dd,
+{
+ /* set font size and line height */
+ /* list of fonts provides fallbacks if a font is not present */
+ font: 12px/18px Verdana, Arial, Helvetica, Sans-Serif;
+}
+
+
+/* pararaphs (docbook: <para>) */
+p
+{
+ /* set font size and line height */
+ /* list of fonts provides fallbacks if a font is not present */
+ font: 12px/18px Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 0 15px 6px 15px;
+}
+
+
+/* images */
+/* docbook: <imageobject> */
+img
+{
+ /* no margin */
+ margin: 0;
+
+ /* no padding ("inner margin") */
+ padding: 0;
+
+ /* no border */
+ border: 0;
+}
+
+
+/* emphasized text, can occur in most places */
+/* docbook: <emphasis> */
+em
+{
+ /* bold face, higher number is more bold */
+ font-weight: 600;
+ /* italic */
+ font-style: italic;
+}
+
+
+/* sect(ion)1 title */
+h2
+{
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* font size, relative to body font size */
+ font-size: 125%;
+
+ /* bold face, higher number is more bold */
+ font-weight: 600;
+
+ /* underlined text */
+ text-decoration: none;
+
+ /* foreground color: dark blue */
+ color: #009;
+
+ /* background color: gray */
+ background-color: #ddd;
+
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 15px 0 15px 0;
+
+ /* padding ("inner margin") settings are top - right - bottom - left */
+ /* (think clockwise) */
+ padding: 12px 15px 12px 15px;
+}
+
+
+/* sect(ion)2 title */
+h3
+{
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* font size, relative to body font size */
+ font-size: 110%;
+
+ /* bold face, higher number is more bold */
+ font-weight: 600;
+
+ /* underlined text */
+ text-decoration: none;
+
+ /* foreground color: dark blue */
+ color: #009;
+
+ /* background-color is a very light grey */
+ /* alternative: #fff = white */
+ background-color: #fefefe;
+
+ /* padding ("inner margin") settings are top - right - bottom - left */
+ /* (think clockwise) */
+ padding: 0 0 0 15px;
+}
+
+
+/* sect(ion)3 title */
+h4
+{
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* font size, relative to body font size */
+ font-size: 100%;
+
+ /* bold face, higher number is more bold */
+ font-weight: 600;
+
+ /* underlined text */
+ text-decoration: none;
+
+ /* foreground color: dark blue */
+ color: #009;
+
+ /* background-color is a very light grey */
+ /* alternative: #fff = white */
+ background-color: #fefefe;
+
+ /* padding ("inner margin") settings are top - right - bottom - left */
+ /* (think clockwise) */
+ padding: 0 0 0 15px;
+}
+
+
+/* sect(ion)4 title */
+h5
+{
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* font size, relative to body font size */
+ font-size: 100%;
+
+ /* bold face, higher number is more bold */
+ font-weight: 300;
+
+ /* not underlined */
+ text-decoration: none ;
+
+ /* foreground color: dark blue */
+ color: #009;
+
+ /* background-color is a very light grey */
+ /* alternative: #fff = white */
+ background-color: #fefefe;
+
+ /* padding ("inner margin") settings are top - right - bottom - left */
+ /* (think clockwise) */
+ padding: 0 0 0 15px;
+}
+
+
+
+
+
+/* define special font for e-novative logo */
+/* list of fonts provides fallbacks in case selected fonts are not present */
+.logo
+{
+ font-family: Lucida Console, Verdana, Arial, Sans-Serif;
+}
+
+
+/* the following formats refer to the docbook tags of the same name */
+/* for more information, see the docbook reference at */
+/* http://www.docbook.org/tdg/en/html/docbook.html */
+
+.mediaobject
+{
+ /* center */
+ text-align: center;
+}
+
+
+/* */
+.calloutlist, .figure, .table
+{
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 15px 30px 15px 30px;
+}
+
+
+/* */
+.itemizedlist, .variablelist {
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 15px 30px 15px 15px;
+}
+
+/* blockquote formatting is a little more complex */
+/* because block quotes are rendered as a html table */
+
+/* blockquote block */
+.blockquote
+{
+ /* override bottom margin, the other margins are inherited */
+ margin-bottom: 30px;
+}
+
+.blockquote p, .blockquote td
+{
+ /* set font size and line height */
+ /* list of fonts provides fallbacks if a font is not present */
+ font: 12px/18px Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* bold face, higher number is more bold */
+ font-weight: 450;
+}
+
+
+.epigraph
+{
+ /* override bottom margin, the other margins are inherited */
+ margin-bottom: 30px;
+}
+
+.epigraph p, .epigraph td
+{
+ /* set font size and line height */
+ /* list of fonts provides fallbacks if a font is not present */
+ font: 10px/14px Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* bold face, higher number is more bold */
+ font-weight: 600;
+}
+
+
+
+/* custom e-novative header and footer that are displayed on all pages */
+#customheader, #customfooter
+{
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* font size, relative to body font size */
+ font-size: 80%;
+
+ /* line height, relative to body font size */
+ line-height: 200%;
+
+
+ text-align: center;
+ vertical-align: middle;
+ color: #fff;
+ background-color: #009;
+}
+
+
+/* leave more space between last paragraph and footer */
+/* some browser do not add up the bottom margin of the prior element */
+/* and the top margin of the footer */
+#customfooter {
+ margin-top: 15px;
+}
+
+
+
+/* table { margin: 0 15px 6px 15px; } */
+
+
+/* title and navigation links in header and footer */
+.navheader th, .navheader td, .navfooter th, .navfooter td
+{
+ font-size: 11px;
+ font-weight: 450;
+}
+
+
+/* table of contents, list of figures and list of tables */
+.toc, .list-of-figures, .list-of-tables
+{
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 15px 30px 15px 15px;
+}
+
+
+/* the "headings" are rendered as paragraphs */
+.toc p, .list-of-figures p, .list-of-tables p
+{
+ /* no margin */
+ margin: 0;
+}
+
+
+.figure
+{
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 5px 5px 5px 5px;
+
+ /* no padding ("inner border") */
+ padding: 0;
+
+ /* no border */
+ border: 0;
+
+ /* center text */
+ text-align: center;
+}
+
+
+/* figure title */
+.figure p, .table p, .example p
+{
+ font-size: 80%;
+}
+
+
+/*
+acronym {
+ border-bottom: 1px dashed #00cc00;
+ cursor: help;
+}
+*/
+
+
+/* admonition headings */
+div.note, div.important, div.warning, div.caution, div.tip
+{
+ padding: 0px 15px 0px 0px;
+}
+
+div.note th, div.important th, div.warning th, div.caution th, div.tip th
+{
+ /* set font size and line height */
+ /* list of fonts provides fallbacks if a font is not present */
+ font: 12px/18px Verdana, Arial, Helvetica, Sans-Serif;
+
+ font-weight: 600;
+
+ text-decoration: underline;
+
+ /* left align */
+ text-align: left;
+}
+
+.note p, .important p, .warning p, .caution p, .tip p
+{
+ margin: 0;
+}
+
+.note img, .important img, .warning img, .caution img, .tip img
+{
+ margin: 0px 15px 0px 15px;
+}
+
+
+/* programlisting */
+pre.programlisting
+{
+ /* non-proportional font */
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: "Courier New", Courier, Monospace;
+
+ /* color: black */
+ color: #000;
+
+ /* background color: gray */
+ background-color: #eee;
+
+ /* no margin */
+ margin: 0;
+
+ /* gray dotted border, 1 px wide */
+ border: 1px dotted #ddd;
+
+ /* padding ("inner margin") settings are top - right - bottom - left */
+ /* (think clockwise) */
+ padding: 6px 6px 6px 6px;
+}
+
+
+/* title page */
+
+
+/* heading1 is used for document title */
+h1
+{
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* font size, relative to body font size */
+ font-size: 150%;
+
+ /* bold face, higher number is more bold */
+ font-weight: 600;
+
+ /* line height, relative to body line height */
+ line-height: 250%;
+
+ /* center */
+ text-align: center;
+
+ /* foreground color: dark blue */
+ color: #009;
+
+ /* background color: gray */
+ background-color: #ddd;
+
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 15px 0 15px 0;
+
+ /* no padding ("inner margin") */
+ padding: 0;
+}
+
+
+
+/* author on title page is formatted as h3 */
+/* these settings overwrite the regular h3 settings */
+h3.author
+{
+ /* set font size and line height */
+ /* list of fonts provides fallbacks in case selected fonts are not present */
+ font: 12px/18px Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* bold face, higher number is more bold */
+ font-weight: 600;
+
+ /* do not underline */
+ text-decoration: none;
+
+ /* center text */
+ text-align: center;
+
+ /* color: black */
+ color: #000;
+
+ /* background-color is a very light grey */
+ /* alternative: #fff = white */
+ background-color: #fefefe;
+
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 0 15px 15px 15px;
+
+ /* no padding */
+ padding: 0;
+
+ /* no border */
+ border: 0;
+}
+
+
+/* copyright and date */
+.copyright, .pubdate
+{
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* font size, relative to body font size */
+ font-size: 90%;
+
+ /* center */
+ text-align: center;
+
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 15px 15px 15px 15px;
+
+ /* no padding ("inner margin") */
+ padding: 0;
+
+ /* no border */
+ border: 0;
+}
+
+
+/* legal notice box */
+div.legalnotice
+{
+ /* list of fonts provides fallbacks if a font is not present */
+ font-family: Verdana, Arial, Helvetica, Sans-Serif;
+
+ /* font size, relative to body font size */
+ font-size: 90%;
+
+ /* color: black */
+ color: #000;
+
+ /* background color: gray */
+ background-color: #ddd;
+
+ /* margin settings are top - right - bottom - left (think clockwise) */
+ margin: 10px 45px 10px 45px;
+
+ /* padding ("inner margin") settings are top - right - bottom - left */
+ /* (think clockwise) */
+ padding: 5px 5px 5px 5px;
+
+ /* solid black border, 1px wide */
+ border: 1px solid #000;
+}
+
+.guilabel {
+ font-weight: bold;
+ color: #009;
+}
+
+.guibutton {
+ background-color: #ddd;
+ border: 1px solid black;
+ font-weight: bold;
+ padding: 0px 1px 0px 1px;
+}
\ No newline at end of file
Added: trunk/rapc/doc/administration/figure/administrative_tools_icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/administrative_tools_icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/apache_information.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/apache_information.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/apache_install.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/apache_install.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/apache_license.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/apache_license.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/apache_location.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/apache_location.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/apache_readme.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/apache_readme.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/apache_setup_type.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/apache_setup_type.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/apache_wizard.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/apache_wizard.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/client_server_deployment.BMP
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/client_server_deployment.BMP
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/client_server_deployment.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/client_server_deployment.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/client_server_deployment.svg
===================================================================
--- trunk/rapc/doc/administration/figure/client_server_deployment.svg (rev 0)
+++ trunk/rapc/doc/administration/figure/client_server_deployment.svg 2006-10-16 08:00:16 UTC (rev 5)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="2.35042in"
+ height="1.75667in" viewBox="0 0 169.23 126.48" xml:space="preserve" color-interpolation-filters="sRGB" class="st7">
+ <title>uml</title>
+ <style type="text/css">
+ <![CDATA[
+ .st1 {fill:#c0c0c0;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st2 {fill:#ffffff;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st3 {fill:#000000;font-family:Arial;font-size:0.666664em;font-weight:bold}
+ .st4 {fill:none;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
+ .st5 {fill:#000000;font-family:Arial;font-size:0.666664em}
+ .st6 {stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
+ .st7 {fill:none;fill-rule:evenodd;font-size:12;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
+ ]]>
+ </style>
+ <g >
+ <title>Stand-alone deployment</title>
+ <g id="group1-1" transform="translate(0.24,-0.24)" >
+ <title>Node</title>
+ <g id="shape2-2" transform="translate(159.75,1.42109E-014)">
+ <title>Sheet.2</title>
+ <path d="M0 126.48 L9 117.48 L9 0.48 L0 9.48 L0 126.48 Z" class="st1"/>
+ </g>
+ <g id="shape3-4" transform="translate(0,-117)">
+ <title>Sheet.3</title>
+ <path d="M0 126.48 L159.75 126.48 L168.75 117.48 L9 117.48 L0 126.48 Z" class="st1"/>
+ </g>
+ <g id="shape4-6" >
+ <title>Name</title>
+ <desc>DCMMS PC</desc>
+ <rect x="0" y="9.48" width="159.75" height="117" class="st2"/>
+ <text x="4" y="20.68" class="st3" >DCMMS PC</text> </g>
+ </g>
+ <g id="group5-9" transform="translate(14.7265,-58.74)" >
+ <title>Component</title>
+ <g id="shape6-10" transform="translate(12.6,1.42109E-014)">
+ <title>Sheet.6</title>
+ <rect x="0" y="90.48" width="80.9271" height="36" class="st2"/>
+ </g>
+ <g id="shape7-12" transform="translate(0,-22.5)">
+ <title>Sheet.7</title>
+ <rect x="0" y="117.48" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape8-14" transform="translate(0,-4.5)">
+ <title>Sheet.8</title>
+ <rect x="0" y="117.48" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape9-16" transform="translate(25.2,1.42109E-014)">
+ <title>Name</title>
+ <desc>DCMMS Server</desc>
+ <rect x="0" y="90.48" width="68.3271" height="36" class="st4"/>
+ <text x="5.5" y="110.88" class="st3" >DCMMS Server</text> </g>
+ </g>
+ <g id="group10-19" transform="translate(17.3416,-9.24)" >
+ <title>Component.10</title>
+ <g id="shape11-20" transform="translate(12.6,1.42109E-014)">
+ <title>Sheet.11</title>
+ <rect x="0" y="90.48" width="74.6967" height="36" class="st2"/>
+ </g>
+ <g id="shape12-22" transform="translate(0,-22.5)">
+ <title>Sheet.12</title>
+ <rect x="0" y="117.48" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape13-24" transform="translate(0,-4.5)">
+ <title>Sheet.13</title>
+ <rect x="0" y="117.48" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape14-26" transform="translate(25.2,1.42109E-014)">
+ <title>Name</title>
+ <desc>Web Browser</desc>
+ <rect x="0" y="90.48" width="62.0967" height="36" class="st4"/>
+ <text x="5.49" y="110.88" class="st3" >Web Browser</text> </g>
+ </g>
+ <g id="group15-29" transform="translate(113.533,-76.74)" >
+ <title>Communicates</title>
+ <g id="shape16-30" transform="translate(3.43255,-5.09117)">
+ <title>end1_name</title>
+ </g>
+ <g id="shape17-32" transform="translate(3.43255,22.6947)">
+ <title>end1_mp</title>
+ <desc>1</desc>
+ <text x="5.5" y="120.08" class="st5" >1</text> </g>
+ <g id="shape18-35" transform="translate(-0.00744535,72.1912)">
+ <title>end2_name</title>
+ </g>
+ <g id="shape19-37" transform="translate(-0.00744535,44.4088)">
+ <title>end2_mp</title>
+ <desc>1</desc>
+ <text x="5.5" y="120.08" class="st5" >1</text> </g>
+ <g id="shape15-40" >
+ <path d="M-5.28 126.48 L-5.37 126.48 L29.96 126.48 L29.96 175.98 L-8.81 175.98 L-8.89 175.98" class="st6"/>
+ </g>
+ </g>
+ </g>
+</svg>
Added: trunk/rapc/doc/administration/figure/control_panel.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/control_panel.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/dccss_components.PNG
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/dccss_components.PNG
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/dccss_database_connection.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/dccss_database_connection.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/dccss_license.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/dccss_license.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/dccss_location.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/dccss_location.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/dccss_uml.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/dccss_uml.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/dccss_uml.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/dccss_uml.vsd
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/gis_data_review.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/gis_data_review.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/internet_deployment.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/internet_deployment.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/internet_deployment.svg
===================================================================
--- trunk/rapc/doc/administration/figure/internet_deployment.svg (rev 0)
+++ trunk/rapc/doc/administration/figure/internet_deployment.svg 2006-10-16 08:00:16 UTC (rev 5)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 internet_deployment.svg Internet Deployment -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="5.38167in"
+ height="2.66292in" viewBox="0 0 387.48 191.73" xml:space="preserve" color-interpolation-filters="sRGB" class="st7">
+ <title>uml</title>
+ <style type="text/css">
+ <![CDATA[
+ .st1 {fill:#c0c0c0;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st2 {fill:#ffffff;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st3 {fill:#000000;font-family:Arial;font-size:0.666664em;font-weight:bold}
+ .st4 {fill:none;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
+ .st5 {fill:#000000;font-family:Arial;font-size:0.666664em}
+ .st6 {stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
+ .st7 {fill:none;fill-rule:evenodd;font-size:12;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
+ ]]>
+ </style>
+ <g >
+ <title>Internet Deployment</title>
+ <g id="group24-1" transform="translate(180.24,-72.24)" >
+ <title>Node.24</title>
+ <g id="shape25-2" transform="translate(198,0)">
+ <title>Sheet.25</title>
+ <path d="M0 191.73 L9 182.73 L9 74.73 L0 83.73 L0 191.73 Z" class="st1"/>
+ </g>
+ <g id="shape26-4" transform="translate(0,-108)">
+ <title>Sheet.26</title>
+ <path d="M0 191.73 L198 191.73 L207 182.73 L9 182.73 L0 191.73 Z" class="st1"/>
+ </g>
+ <g id="shape27-6" >
+ <title>Name</title>
+ <desc>VPN Server</desc>
+ <rect x="0" y="83.73" width="198" height="108" class="st2"/>
+ <text x="4" y="94.93" class="st3" >VPN Server</text> </g>
+ </g>
+ <g id="group1-9" transform="translate(0.24,-0.24)" >
+ <title>Node.20</title>
+ <g id="shape2-10" transform="translate(162,0)">
+ <title>Sheet.2</title>
+ <path d="M0 191.73 L9 182.73 L9 119.73 L0 128.73 L0 191.73 Z" class="st1"/>
+ </g>
+ <g id="shape3-12" transform="translate(0,-63)">
+ <title>Sheet.3</title>
+ <path d="M0 191.73 L162 191.73 L171 182.73 L9 182.73 L0 191.73 Z" class="st1"/>
+ </g>
+ <g id="shape4-14" >
+ <title>Name</title>
+ <desc>DCMMS Client</desc>
+ <rect x="0" y="128.73" width="162" height="63" class="st2"/>
+ <text x="4" y="139.93" class="st3" >DCMMS Client</text> </g>
+ </g>
+ <g id="group5-17" transform="translate(1.365,-90.24)" >
+ <title>Node</title>
+ <g id="shape6-18" transform="translate(159.75,0)">
+ <title>Sheet.6</title>
+ <path d="M0 191.73 L9 182.73 L9 90.48 L0 99.48 L0 191.73 Z" class="st1"/>
+ </g>
+ <g id="shape7-20" transform="translate(0,-92.25)">
+ <title>Sheet.7</title>
+ <path d="M0 191.73 L159.75 191.73 L168.75 182.73 L9 182.73 L0 191.73 Z" class="st1"/>
+ </g>
+ <g id="shape8-22" >
+ <title>Name</title>
+ <desc>DCMMS Server</desc>
+ <rect x="0" y="99.48" width="159.75" height="92.25" class="st2"/>
+ <text x="4" y="110.68" class="st3" >DCMMS Server</text> </g>
+ </g>
+ <g id="group9-25" transform="translate(16.9765,-99.24)" >
+ <title>Component</title>
+ <g id="shape10-26" transform="translate(12.6,0)">
+ <title>Sheet.10</title>
+ <rect x="0" y="155.73" width="80.9271" height="36" class="st2"/>
+ </g>
+ <g id="shape11-28" transform="translate(0,-22.5)">
+ <title>Sheet.11</title>
+ <rect x="0" y="182.73" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape12-30" transform="translate(0,-4.5)">
+ <title>Sheet.12</title>
+ <rect x="0" y="182.73" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape13-32" transform="translate(25.2,0)">
+ <title>Name</title>
+ <desc>DCMMS Server</desc>
+ <rect x="0" y="155.73" width="68.3271" height="36" class="st4"/>
+ <text x="5.5" y="176.13" class="st3" >DCMMS Server</text> </g>
+ </g>
+ <g id="group14-35" transform="translate(16.9716,-9.24)" >
+ <title>Component.10</title>
+ <g id="shape15-36" transform="translate(12.6,0)">
+ <title>Sheet.15</title>
+ <rect x="0" y="155.73" width="74.6967" height="36" class="st2"/>
+ </g>
+ <g id="shape16-38" transform="translate(0,-22.5)">
+ <title>Sheet.16</title>
+ <rect x="0" y="182.73" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape17-40" transform="translate(0,-4.5)">
+ <title>Sheet.17</title>
+ <rect x="0" y="182.73" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape18-42" transform="translate(25.2,0)">
+ <title>Name</title>
+ <desc>Web Browser</desc>
+ <rect x="0" y="155.73" width="62.0967" height="36" class="st4"/>
+ <text x="5.49" y="176.13" class="st3" >Web Browser</text> </g>
+ </g>
+ <g id="group19-45" transform="translate(348.222,-126.24)" >
+ <title>Communicates</title>
+ <g id="shape20-46" transform="translate(16.1847,-5.09117)">
+ <title>end1_name</title>
+ </g>
+ <g id="shape21-48" transform="translate(16.1847,22.6947)">
+ <title>end1_mp</title>
+ <desc>1</desc>
+ <text x="5.5" y="185.33" class="st5" >1</text> </g>
+ <g id="shape22-51" transform="translate(-227.769,121.691)">
+ <title>end2_name</title>
+ </g>
+ <g id="shape23-53" transform="translate(-227.769,93.9088)">
+ <title>end2_mp</title>
+ <desc>*</desc>
+ <text x="5.49" y="185.33" class="st5" >*</text> </g>
+ <g id="shape19-56" >
+ <path d="M0 191.73 L13.42 191.73 L13.42 290.73 L-243.95 290.73" class="st6"/>
+ </g>
+ </g>
+ <g id="group28-59" transform="translate(282.258,-108.24)" >
+ <title>Component.28</title>
+ <g id="shape29-60" transform="translate(12.6,0)">
+ <title>Sheet.29</title>
+ <rect x="0" y="155.73" width="53.3646" height="36" class="st2"/>
+ </g>
+ <g id="shape30-62" transform="translate(0,-22.5)">
+ <title>Sheet.30</title>
+ <rect x="0" y="182.73" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape31-64" transform="translate(0,-4.5)">
+ <title>Sheet.31</title>
+ <rect x="0" y="182.73" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape32-66" transform="translate(25.2,0)">
+ <title>Name</title>
+ <desc>Firewall</desc>
+ <rect x="0" y="155.73" width="40.7646" height="36" class="st4"/>
+ <text x="5.48" y="176.13" class="st3" >Firewall</text> </g>
+ </g>
+ <g id="group33-69" transform="translate(191.881,-108.24)" >
+ <title>Component.33</title>
+ <g id="shape34-70" transform="translate(12.6,0)">
+ <title>Sheet.34</title>
+ <rect x="0" y="155.73" width="67.1573" height="36" class="st2"/>
+ </g>
+ <g id="shape35-72" transform="translate(0,-22.5)">
+ <title>Sheet.35</title>
+ <rect x="0" y="182.73" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape36-74" transform="translate(0,-4.5)">
+ <title>Sheet.36</title>
+ <rect x="0" y="182.73" width="25.2" height="9" class="st2"/>
+ </g>
+ <g id="shape37-76" transform="translate(25.2,0)">
+ <title>Name</title>
+ <desc>VPN Server</desc>
+ <rect x="0" y="155.73" width="54.5573" height="36" class="st4"/>
+ <text x="5.48" y="176.13" class="st3" >VPN Server</text> </g>
+ </g>
+ <g id="group38-79" transform="translate(315.24,-99.24)" >
+ <title>Dynamic Connector</title>
+ <g id="shape39-80" transform="translate(5.09117,17.8156)">
+ <title>end1_name</title>
+ </g>
+ <g id="shape40-82" transform="translate(-20.5163,17.8191)">
+ <title>end1_mp</title>
+ <desc>1</desc>
+ <text x="5.5" y="185.33" class="st5" >1</text> </g>
+ <g id="shape41-85" transform="translate(-96.5712,17.8156)">
+ <title>end2_name</title>
+ </g>
+ <g id="shape42-87" transform="translate(-78.3888,17.8191)">
+ <title>end2_mp</title>
+ <desc>1</desc>
+ <text x="5.5" y="185.33" class="st5" >1</text> </g>
+ <g id="shape38-90" >
+ <path d="M0 182.73 L0 209.73 L-83.48 209.73 L-83.48 182.73" class="st6"/>
+ </g>
+ </g>
+ <g id="group43-93" transform="translate(231.76,-148.74)" >
+ <title>Dynamic Connector.43</title>
+ <g id="shape44-94" transform="translate(-13.0912,-6.71177)">
+ <title>end1_name</title>
+ </g>
+ <g id="shape45-96" transform="translate(5.09117,-6.71177)">
+ <title>end1_mp</title>
+ <desc>1</desc>
+ <text x="5.5" y="185.33" class="st5" >1</text> </g>
+ <g id="shape46-99" transform="translate(-162.929,2.28823)">
+ <title>end2_name</title>
+ </g>
+ <g id="shape47-101" transform="translate(-188.536,2.28823)">
+ <title>end2_mp</title>
+ <desc>1</desc>
+ <text x="5.5" y="185.33" class="st5" >1</text> </g>
+ <g id="shape43-104" >
+ <path d="M0 196.23 L0 182.73 L-168.02 182.73 L-168.02 205.23" class="st6"/>
+ </g>
+ </g>
+ </g>
+</svg>
Added: trunk/rapc/doc/administration/figure/php_components.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/php_components.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/php_license.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/php_license.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/php_location.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/php_location.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/poedit_php_parser.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/poedit_php_parser.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/poedit_php_path.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/poedit_php_path.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgis_components.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgis_components.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgis_database_connection.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgis_database_connection.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgis_installation_complete.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgis_installation_complete.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgis_license.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgis_license.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgis_location.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgis_location.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgis_patience.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgis_patience.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgis_reboot.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgis_reboot.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_account_error.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_account_error.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_contrib_modules.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_contrib_modules.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_database_cluster.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_database_cluster.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_enable_postgis.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_enable_postgis.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_installation_complete.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_installation_complete.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_installation_notes.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_installation_notes.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_installation_options.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_installation_options.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_installation_ready.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_installation_ready.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_language_selection.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_language_selection.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_log_on_as_service.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_log_on_as_service.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_password.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_password.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_procedural_languages.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_procedural_languages.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_service_configuration.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_service_configuration.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_users.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_users.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postgresql_welcome.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postgresql_welcome.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postmaster_service.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postmaster_service.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postmaster_service_logon.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postmaster_service_logon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/postmaster_service_properties.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/postmaster_service_properties.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/rapc_components.PNG
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/rapc_components.PNG
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/rapc_database_connection.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/rapc_database_connection.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/rapc_location.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/rapc_location.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/rapc_uml.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/rapc_uml.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/rapc_uml.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/rapc_uml.vsd
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/service_start.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/service_start.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/service_stop.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/service_stop.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/services_context_menu.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/services_context_menu.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/services_icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/services_icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/standalone_deployment.png
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/doc/administration/figure/standalone_deployment.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rapc/doc/administration/figure/standalone_deployment.svg
===================================================================
--- trunk/rapc/doc/administration/figure/standalone_deployment.svg (rev 0)
+++ trunk/rapc/doc/administration/figure/standalone_deployment.svg 2006-10-16 08:00:16 UTC (rev 5)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 standalone_deployment.svg Static Structure-1 -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="2.35042in"
+ height="1.75667in" viewBox="0 0 169.23 126.48" xml:space="preserve" color-interpolation-filters="sRGB" class="st7">
+ <title>uml</title>
+ <v:documentProperties v:langID="1031" v:metric="true" v:viewMarkup="false"/>
+
+ <style type="text/css">
+ <![CDATA[
+ .st1 {fill:#c0c0c0;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st2 {fill:#ffffff;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st3 {fill:#000000;font-family:Arial;font-size:0.666664em;font-weight:bold}
+ .st4 {fill:none;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
+ .st5 {fill:#000000;font-family:Arial;font-size:0.666664em}
+ .st6 {stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
+ .st7 {fill:none;fill-rule:evenodd;font-size:12;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
+ ]]>
+ </style>
+
+ <g v:mID="0" v:index="1" v:groupContext="foregroundPage">
+ <v:userDefs>
+ <v:ud v:nameU="UMLDiagramType" v:val="VT0(0):26"/>
+ <v:ud v:nameU="UMLPageGUID" v:prompt="" v:val="VT14({CC435296-93B8-11D3-9080-00C04F3FD50D}):41"/>
+ </v:userDefs>
+ <title>Stand-alone deployment</title>
+ <v:pageProperties v:drawingScale="0.393701" v:pageScale="0.393701" v:drawingUnits="6" v:shadowOffsetX="9"
+ v:shadowOffsetY="-9"/>
+ <g id="group1-1" transform="translate(0.24,-0.24)" v:mID="1" v:groupContext="group">
+ <v:userDefs>
+ <v:ud v:nameU="UMLShapeType" v:val="VT0(26):26"/>
+ <v:ud v:nameU="UMLObjectGUID" v:val="VT4({B456B6D0-40FE-413D-B13C-16E05100FD13})"/>
+ <v:ud v:nameU="UMLError" v:val="VT0(0):26"/>
+ <v:ud v:nameU="UMLPresOption1" v:val="VT0(3):26"/>
+ <v:ud v:nameU="UMLVersion" v:...
[truncated message content] |
|
From: <mah...@us...> - 2006-11-07 13:07:36
|
Revision: 6
http://svn.sourceforge.net/rapc/?rev=6&view=rev
Author: maher_karim
Date: 2006-11-07 05:05:49 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
2006-11-6 Maher Abdel karim <mah...@do...>
* address_confirmation.php:fix to deal with multiple results, and zoom to
extent.
* print.php:deal with address confirmation result.Adjust print layout.
2006-11-5 Maher Abdel karim <mah...@do...>
* address_confirmation.php:
* map.php:deal with variable passing for AC.
* panelinstallation_report.php:adjust date display based on fatimah's
remarks.
* panelpage.php:
* include/public_panel.php:deal with mpwh remarks, and fix the image
loading.
2006-10-31 Maher Abdel karim <mah...@do...>
* map.php: add new action.
* script/create_rapc_ddl.sql:
* address_confirmation.php:add address confirmation functionality.
* admin/user_management.php:user management tools.
2006-10-17 Maher Abdel karim <mah...@do...>
* etc/rapc_flyer.sla:rapc flyer.
* dccssconfig.php.default
* dccssconfig.php:Add new variables for image loading handling.
* dataobject/public_panel.php:Add image loading functionality,regiteration
no,adjust calculations filling.
* dataobject/rapc.ini:add image, and registerno fields
* script/create_rapc_ddl.sql:add image, and regiterno fields to panel table.
* index.php:Add ministry logos.
* panelpage.php:introduce move_file(),implement xajax for regiterno field.
* include/xajax_js/*:files needed to implement xajax
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/conf/dccssconfig.php
trunk/rapc/conf/dccssconfig.php.default
trunk/rapc/conf/rapc_en.map
trunk/rapc/include/i18n.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/map.php
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
trunk/rapc/print.php
trunk/rapc/script/create_rapc_ddl.sql
Added Paths:
-----------
trunk/rapc/images/northarrow.PNG
trunk/rapc/include/xajax.inc.php
trunk/rapc/include/xajaxCompress.php
trunk/rapc/include/xajaxResponse.inc.php
trunk/rapc/include/xajax_js/
trunk/rapc/include/xajax_js/xajax.js
trunk/rapc/include/xajax_js/xajax_uncompressed.js
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-11-07 13:07:37
|
Revision: 6
http://svn.sourceforge.net/rapc/?rev=6&view=rev
Author: maher_karim
Date: 2006-11-07 05:05:49 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
2006-11-6 Maher Abdel karim <mah...@do...>
* address_confirmation.php:fix to deal with multiple results, and zoom to
extent.
* print.php:deal with address confirmation result.Adjust print layout.
2006-11-5 Maher Abdel karim <mah...@do...>
* address_confirmation.php:
* map.php:deal with variable passing for AC.
* panelinstallation_report.php:adjust date display based on fatimah's
remarks.
* panelpage.php:
* include/public_panel.php:deal with mpwh remarks, and fix the image
loading.
2006-10-31 Maher Abdel karim <mah...@do...>
* map.php: add new action.
* script/create_rapc_ddl.sql:
* address_confirmation.php:add address confirmation functionality.
* admin/user_management.php:user management tools.
2006-10-17 Maher Abdel karim <mah...@do...>
* etc/rapc_flyer.sla:rapc flyer.
* dccssconfig.php.default
* dccssconfig.php:Add new variables for image loading handling.
* dataobject/public_panel.php:Add image loading functionality,regiteration
no,adjust calculations filling.
* dataobject/rapc.ini:add image, and registerno fields
* script/create_rapc_ddl.sql:add image, and regiterno fields to panel table.
* index.php:Add ministry logos.
* panelpage.php:introduce move_file(),implement xajax for regiterno field.
* include/xajax_js/*:files needed to implement xajax
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/conf/dccssconfig.php
trunk/rapc/conf/dccssconfig.php.default
trunk/rapc/conf/rapc_en.map
trunk/rapc/include/i18n.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/map.php
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
trunk/rapc/print.php
trunk/rapc/script/create_rapc_ddl.sql
Added Paths:
-----------
trunk/rapc/images/northarrow.PNG
trunk/rapc/include/xajax.inc.php
trunk/rapc/include/xajaxCompress.php
trunk/rapc/include/xajaxResponse.inc.php
trunk/rapc/include/xajax_js/
trunk/rapc/include/xajax_js/xajax.js
trunk/rapc/include/xajax_js/xajax_uncompressed.js
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2006-10-16 08:00:16 UTC (rev 5)
+++ trunk/rapc/changelog 2006-11-07 13:05:49 UTC (rev 6)
@@ -1,3 +1,40 @@
+2006-11-6 Maher Abdel karim <mah...@do...>
+
+ * address_confirmation.php:fix to deal with multiple results, and zoom to
+ extent.
+
+ * print.php:deal with address confirmation result.Adjust print layout.
+
+2006-11-5 Maher Abdel karim <mah...@do...>
+
+ * address_confirmation.php:
+ * map.php:deal with variable passing for AC.
+ * panelinstallation_report.php:adjust date display based on fatimah's
+ remarks.
+ * panelpage.php:
+ * include/public_panel.php:deal with mpwh remarks, and fix the image
+ loading.
+
+2006-10-31 Maher Abdel karim <mah...@do...>
+
+ * map.php: add new action.
+ * script/create_rapc_ddl.sql:
+ * address_confirmation.php:add address confirmation functionality.
+ * admin/user_management.php:user management tools.
+
+2006-10-17 Maher Abdel karim <mah...@do...>
+
+ * etc/rapc_flyer.sla:rapc flyer.
+ * dccssconfig.php.default
+ * dccssconfig.php:Add new variables for image loading handling.
+ * dataobject/public_panel.php:Add image loading functionality,regiteration
+ no,adjust calculations filling.
+ * dataobject/rapc.ini:add image, and registerno fields
+ * script/create_rapc_ddl.sql:add image, and regiterno fields to panel table.
+ * index.php:Add ministry logos.
+ * panelpage.php:introduce move_file(),implement xajax for regiterno field.
+ * include/xajax_js/*:files needed to implement xajax
+
2006-10-12 Maher Abdel karim <mah...@do...>
* include/i18n.php:add more translation.
Modified: trunk/rapc/conf/dccssconfig.php
===================================================================
--- trunk/rapc/conf/dccssconfig.php 2006-10-16 08:00:16 UTC (rev 5)
+++ trunk/rapc/conf/dccssconfig.php 2006-11-07 13:05:49 UTC (rev 6)
@@ -119,4 +119,7 @@
* set textdomain
**/
$_SESSION['textdomain']='rapc';
+
+//Directory to save loaded images
+$_SESSION['imagedir']="c:/program files/mpwh/rapc/data/plugin/";
?>
Modified: trunk/rapc/conf/dccssconfig.php.default
===================================================================
--- trunk/rapc/conf/dccssconfig.php.default 2006-10-16 08:00:16 UTC (rev 5)
+++ trunk/rapc/conf/dccssconfig.php.default 2006-11-07 13:05:49 UTC (rev 6)
@@ -118,4 +118,6 @@
* set textdomain
**/
$_SESSION['textdomain']='rapc';
+//Directory to save loaded images
+$_SESSION['imagedir']="c:/program files/rapc/data/plugin/";
?>
Modified: trunk/rapc/conf/rapc_en.map
===================================================================
--- trunk/rapc/conf/rapc_en.map 2006-10-16 08:00:16 UTC (rev 5)
+++ trunk/rapc/conf/rapc_en.map 2006-11-07 13:05:49 UTC (rev 6)
@@ -85,7 +85,7 @@
QUERYMAP
STYLE hilite
- COLOR 255 0 0
+ COLOR 255 255 0
outline 24
END #QUERYMAP
@@ -111,11 +111,7 @@
CLASS
NAME 'Adminsub.shp'
TEMPLATE 'template.html'
- #RASTERFILL_STYLE_SOLID
- STYLE
- COLOR 255 251 195
- BACKGROUNDCOLOR 255 255 255
- END #STYLE
+
#OUTLINE SYMBOL
STYLE
OUTLINECOLOR 0 0 0
@@ -124,6 +120,50 @@
END
END #CLASS
END #LAYER
+
+ LAYER #plot.shp
+ #TRANSPARENCY 100
+ NAME 'basemap'
+ METADATA
+ gix_layername "basemap.shp"
+ gix_layerfieldalias "plot_no"
+ END #METADATA
+ TOLERANCE 3
+ labelitem "plot_no"
+ TOLERANCEUNITS pixels
+ DATA 'c:\temp\theme1.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'
@@ -152,6 +192,7 @@
SIZE 1
COLOR 231 51 170
END #STYLE
+
END #CLASS
END #LAYER
Added: trunk/rapc/images/northarrow.PNG
===================================================================
(Binary files differ)
Property changes on: trunk/rapc/images/northarrow.PNG
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/rapc/include/i18n.php
===================================================================
--- trunk/rapc/include/i18n.php 2006-10-16 08:00:16 UTC (rev 5)
+++ trunk/rapc/include/i18n.php 2006-11-07 13:05:49 UTC (rev 6)
@@ -75,6 +75,7 @@
_("Mafraq");
_("Tafilah");
_("Zarqa");
+_("Companyname");
?>
Added: trunk/rapc/include/xajax.inc.php
===================================================================
--- trunk/rapc/include/xajax.inc.php (rev 0)
+++ trunk/rapc/include/xajax.inc.php 2006-11-07 13:05:49 UTC (rev 6)
@@ -0,0 +1,1239 @@
+<?php
+/**
+ * xajax.inc.php :: Main xajax class and setup file
+ *
+ * xajax version 0.2.4
+ * copyright (c) 2005 by Jared White & J. Max Wilson
+ * http://www.xajaxproject.org
+ *
+ * xajax is an open source PHP class library for easily creating powerful
+ * PHP-driven, web-based Ajax Applications. Using xajax, you can asynchronously
+ * call PHP functions and update the content of your your webpage without
+ * reloading the page.
+ *
+ * xajax is released under the terms of the LGPL license
+ * http://www.gnu.org/copyleft/lesser.html#SEC3
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @package xajax
+ * @version $Id$
+ * @copyright Copyright (c) 2005-2006 by Jared White & J. Max Wilson
+ * @license http://www.gnu.org/copyleft/lesser.html#SEC3 LGPL License
+ */
+
+/*
+ ----------------------------------------------------------------------------
+ | Online documentation for this class is available on the xajax wiki at: |
+ | http://wiki.xajaxproject.org/Documentation:xajax.inc.php |
+ ----------------------------------------------------------------------------
+*/
+
+/**
+ * Define XAJAX_DEFAULT_CHAR_ENCODING that is used by both
+ * the xajax and xajaxResponse classes
+ */
+if (!defined ('XAJAX_DEFAULT_CHAR_ENCODING'))
+{
+ define ('XAJAX_DEFAULT_CHAR_ENCODING', 'utf-8' );
+}
+
+require_once(dirname(__FILE__)."/xajaxResponse.inc.php");
+
+/**
+ * Communication Method Defines
+ */
+if (!defined ('XAJAX_GET'))
+{
+ define ('XAJAX_GET', 0);
+}
+if (!defined ('XAJAX_POST'))
+{
+ define ('XAJAX_POST', 1);
+}
+
+/**
+ * The xajax class generates the xajax javascript for your page including the
+ * Javascript wrappers for the PHP functions that you want to call from your page.
+ * It also handles processing and executing the command messages in the XML responses
+ * sent back to your page from your PHP functions.
+ *
+ * @package xajax
+ */
+class xajax
+{
+ /**#@+
+ * @access protected
+ */
+ /**
+ * @var array Array of PHP functions that will be callable through javascript wrappers
+ */
+ var $aFunctions;
+ /**
+ * @var array Array of object callbacks that will allow Javascript to call PHP methods (key=function name)
+ */
+ var $aObjects;
+ /**
+ * @var array Array of RequestTypes to be used with each function (key=function name)
+ */
+ var $aFunctionRequestTypes;
+ /**
+ * @var array Array of Include Files for any external functions (key=function name)
+ */
+ var $aFunctionIncludeFiles;
+ /**
+ * @var string Name of the PHP function to call if no callable function was found
+ */
+ var $sCatchAllFunction;
+ /**
+ * @var string Name of the PHP function to call before any other function
+ */
+ var $sPreFunction;
+ /**
+ * @var string The URI for making requests to the xajax object
+ */
+ var $sRequestURI;
+ /**
+ * @var string The prefix to prepend to the javascript wraper function name
+ */
+ var $sWrapperPrefix;
+ /**
+ * @var boolean Show debug messages (default false)
+ */
+ var $bDebug;
+ /**
+ * @var boolean Show messages in the client browser's status bar (default false)
+ */
+ var $bStatusMessages;
+ /**
+ * @var boolean Allow xajax to exit after processing a request (default true)
+ */
+ var $bExitAllowed;
+ /**
+ * @var boolean Use wait cursor in browser (default true)
+ */
+ var $bWaitCursor;
+ /**
+ * @var boolean Use an special xajax error handler so the errors are sent to the browser properly (default false)
+ */
+ var $bErrorHandler;
+ /**
+ * @var string Specify what, if any, file xajax should log errors to (and more information in a future release)
+ */
+ var $sLogFile;
+ /**
+ * @var boolean Clean all output buffers before outputting response (default false)
+ */
+ var $bCleanBuffer;
+ /**
+ * @var string String containing the character encoding used
+ */
+ var $sEncoding;
+ /**
+ * @var boolean Decode input request args from UTF-8 (default false)
+ */
+ var $bDecodeUTF8Input;
+ /**
+ * @var boolean Convert special characters to HTML entities (default false)
+ */
+ var $bOutputEntities;
+ /**
+ * @var array Array for parsing complex objects
+ */
+ var $aObjArray;
+ /**
+ * @var integer Position in $aObjArray
+ */
+ var $iPos;
+
+ /**#@-*/
+
+ /**
+ * Constructor. You can set some extra xajax options right away or use
+ * individual methods later to set options.
+ *
+ * @param string defaults to the current browser URI
+ * @param string defaults to "xajax_";
+ * @param string defaults to XAJAX_DEFAULT_CHAR_ENCODING defined above
+ * @param boolean defaults to false
+ */
+ function xajax($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding=XAJAX_DEFAULT_CHAR_ENCODING,$bDebug=false)
+ {
+ $this->aFunctions = array();
+ $this->aObjects = array();
+ $this->aFunctionIncludeFiles = array();
+ $this->sRequestURI = $sRequestURI;
+ if ($this->sRequestURI == "")
+ $this->sRequestURI = $this->_detectURI();
+ $this->sWrapperPrefix = $sWrapperPrefix;
+ $this->bDebug = $bDebug;
+ $this->bStatusMessages = false;
+ $this->bWaitCursor = true;
+ $this->bExitAllowed = true;
+ $this->bErrorHandler = false;
+ $this->sLogFile = "";
+ $this->bCleanBuffer = false;
+ $this->setCharEncoding($sEncoding);
+ $this->bDecodeUTF8Input = false;
+ $this->bOutputEntities = false;
+ }
+
+ /**
+ * Sets the URI to which requests will be made.
+ * <i>Usage:</i> <kbd>$xajax->setRequestURI("http://www.xajaxproject.org");</kbd>
+ *
+ * @param string the URI (can be absolute or relative) of the PHP script
+ * that will be accessed when an xajax request occurs
+ */
+ function setRequestURI($sRequestURI)
+ {
+ $this->sRequestURI = $sRequestURI;
+ }
+
+ /**
+ * Sets the prefix that will be appended to the Javascript wrapper
+ * functions (default is "xajax_").
+ *
+ * @param string
+ */
+ //
+ function setWrapperPrefix($sPrefix)
+ {
+ $this->sWrapperPrefix = $sPrefix;
+ }
+
+ /**
+ * Enables debug messages for xajax.
+ * */
+ function debugOn()
+ {
+ $this->bDebug = true;
+ }
+
+ /**
+ * Disables debug messages for xajax (default behavior).
+ */
+ function debugOff()
+ {
+ $this->bDebug = false;
+ }
+
+ /**
+ * Enables messages in the browser's status bar for xajax.
+ */
+ function statusMessagesOn()
+ {
+ $this->bStatusMessages = true;
+ }
+
+ /**
+ * Disables messages in the browser's status bar for xajax (default behavior).
+ */
+ function statusMessagesOff()
+ {
+ $this->bStatusMessages = false;
+ }
+
+ /**
+ * Enables the wait cursor to be displayed in the browser (default behavior).
+ */
+ function waitCursorOn()
+ {
+ $this->bWaitCursor = true;
+ }
+
+ /**
+ * Disables the wait cursor to be displayed in the browser.
+ */
+ function waitCursorOff()
+ {
+ $this->bWaitCursor = false;
+ }
+
+ /**
+ * Enables xajax to exit immediately after processing a request and
+ * sending the response back to the browser (default behavior).
+ */
+ function exitAllowedOn()
+ {
+ $this->bExitAllowed = true;
+ }
+
+ /**
+ * Disables xajax's default behavior of exiting immediately after
+ * processing a request and sending the response back to the browser.
+ */
+ function exitAllowedOff()
+ {
+ $this->bExitAllowed = false;
+ }
+
+ /**
+ * Turns on xajax's error handling system so that PHP errors that occur
+ * during a request are trapped and pushed to the browser in the form of
+ * a Javascript alert.
+ */
+ function errorHandlerOn()
+ {
+ $this->bErrorHandler = true;
+ }
+
+ /**
+ * Turns off xajax's error handling system (default behavior).
+ */
+ function errorHandlerOff()
+ {
+ $this->bErrorHandler = false;
+ }
+
+ /**
+ * Specifies a log file that will be written to by xajax during a request
+ * (used only by the error handling system at present). If you don't invoke
+ * this method, or you pass in "", then no log file will be written to.
+ * <i>Usage:</i> <kbd>$xajax->setLogFile("/xajax_logs/errors.log");</kbd>
+ */
+ function setLogFile($sFilename)
+ {
+ $this->sLogFile = $sFilename;
+ }
+
+ /**
+ * Causes xajax to clean out all output buffers before outputting a
+ * response (default behavior).
+ */
+ function cleanBufferOn()
+ {
+ $this->bCleanBuffer = true;
+ }
+ /**
+ * Turns off xajax's output buffer cleaning.
+ */
+ function cleanBufferOff()
+ {
+ $this->bCleanBuffer = false;
+ }
+
+ /**
+ * Sets the character encoding for the HTTP output based on
+ * <kbd>$sEncoding</kbd>, which is a string containing the character
+ * encoding to use. You don't need to use this method normally, since the
+ * character encoding for the response gets set automatically based on the
+ * <kbd>XAJAX_DEFAULT_CHAR_ENCODING</kbd> constant.
+ * <i>Usage:</i> <kbd>$xajax->setCharEncoding("utf-8");</kbd>
+ *
+ * @param string the encoding type to use (utf-8, iso-8859-1, etc.)
+ */
+ function setCharEncoding($sEncoding)
+ {
+ $this->sEncoding = $sEncoding;
+ }
+
+ /**
+ * Causes xajax to decode the input request args from UTF-8 to the current
+ * encoding if possible. Either the iconv or mb_string extension must be
+ * present for optimal functionality.
+ */
+ function decodeUTF8InputOn()
+ {
+ $this->bDecodeUTF8Input = true;
+ }
+
+ /**
+ * Turns off decoding the input request args from UTF-8 (default behavior).
+ */
+ function decodeUTF8InputOff()
+ {
+ $this->bDecodeUTF8Input = false;
+ }
+
+ /**
+ * Tells the response object to convert special characters to HTML entities
+ * automatically (only works if the mb_string extension is available).
+ */
+ function outputEntitiesOn()
+ {
+ $this->bOutputEntities = true;
+ }
+
+ /**
+ * Tells the response object to output special characters intact. (default
+ * behavior).
+ */
+ function outputEntitiesOff()
+ {
+ $this->bOutputEntities = false;
+ }
+
+ /**
+ * Registers a PHP function or method to be callable through xajax in your
+ * Javascript. If you want to register a function, pass in the name of that
+ * function. If you want to register a static class method, pass in an
+ * array like so:
+ * <kbd>array("myFunctionName", "myClass", "myMethod")</kbd>
+ * For an object instance method, use an object variable for the second
+ * array element (and in PHP 4 make sure you put an & before the variable
+ * to pass the object by reference). Note: the function name is what you
+ * call via Javascript, so it can be anything as long as it doesn't
+ * conflict with any other registered function name.
+ *
+ * <i>Usage:</i> <kbd>$xajax->registerFunction("myFunction");</kbd>
+ * or: <kbd>$xajax->registerFunction(array("myFunctionName", &$myObject, "myMethod"));</kbd>
+ *
+ * @param mixed contains the function name or an object callback array
+ * @param mixed request type (XAJAX_GET/XAJAX_POST) that should be used
+ * for this function. Defaults to XAJAX_POST.
+ */
+ function registerFunction($mFunction,$sRequestType=XAJAX_POST)
+ {
+ if (is_array($mFunction)) {
+ $this->aFunctions[$mFunction[0]] = 1;
+ $this->aFunctionRequestTypes[$mFunction[0]] = $sRequestType;
+ $this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
+ }
+ else {
+ $this->aFunctions[$mFunction] = 1;
+ $this->aFunctionRequestTypes[$mFunction] = $sRequestType;
+ }
+ }
+
+ /**
+ * Registers a PHP function to be callable through xajax which is located
+ * in some other file. If the function is requested the external file will
+ * be included to define the function before the function is called.
+ *
+ * <i>Usage:</i> <kbd>$xajax->registerExternalFunction("myFunction","myFunction.inc.php",XAJAX_POST);</kbd>
+ *
+ * @param string contains the function name or an object callback array
+ * ({@link xajax::registerFunction() see registerFunction} for
+ * more info on object callback arrays)
+ * @param string contains the path and filename of the include file
+ * @param mixed the RequestType (XAJAX_GET/XAJAX_POST) that should be used
+ * for this function. Defaults to XAJAX_POST.
+ */
+ function registerExternalFunction($mFunction,$sIncludeFile,$sRequestType=XAJAX_POST)
+ {
+ $this->registerFunction($mFunction, $sRequestType);
+
+ if (is_array($mFunction)) {
+ $this->aFunctionIncludeFiles[$mFunction[0]] = $sIncludeFile;
+ }
+ else {
+ $this->aFunctionIncludeFiles[$mFunction] = $sIncludeFile;
+ }
+ }
+
+ /**
+ * Registers a PHP function to be called when xajax cannot find the
+ * function being called via Javascript. Because this is technically
+ * impossible when using "wrapped" functions, the catch-all feature is
+ * only useful when you're directly using the xajax.call() Javascript
+ * method. Use the catch-all feature when you want more dynamic ability to
+ * intercept unknown calls and handle them in a custom way.
+ *
+ * <i>Usage:</i> <kbd>$xajax->registerCatchAllFunction("myCatchAllFunction");</kbd>
+ *
+ * @param string contains the function name or an object callback array
+ * ({@link xajax::registerFunction() see registerFunction} for
+ * more info on object callback arrays)
+ */
+ function registerCatchAllFunction($mFunction)
+ {
+ if (is_array($mFunction)) {
+ $this->sCatchAllFunction = $mFunction[0];
+ $this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
+ }
+ else {
+ $this->sCatchAllFunction = $mFunction;
+ }
+ }
+
+ /**
+ * Registers a PHP function to be called before xajax calls the requested
+ * function. xajax will automatically add the request function's response
+ * to the pre-function's response to create a single response. Another
+ * feature is the ability to return not just a response, but an array with
+ * the first element being false (a boolean) and the second being the
+ * response. In this case, the pre-function's response will be returned to
+ * the browser without xajax calling the requested function.
+ *
+ * <i>Usage:</i> <kbd>$xajax->registerPreFunction("myPreFunction");</kbd>
+ *
+ * @param string contains the function name or an object callback array
+ * ({@link xajax::registerFunction() see registerFunction} for
+ * more info on object callback arrays)
+ */
+ function registerPreFunction($mFunction)
+ {
+ if (is_array($mFunction)) {
+ $this->sPreFunction = $mFunction[0];
+ $this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
+ }
+ else {
+ $this->sPreFunction = $mFunction;
+ }
+ }
+
+ /**
+ * Returns true if xajax can process the request, false if otherwise.
+ * You can use this to determine if xajax needs to process the request or
+ * not.
+ *
+ * @return boolean
+ */
+ function canProcessRequests()
+ {
+ if ($this->getRequestMode() != -1) return true;
+ return false;
+ }
+
+ /**
+ * Returns the current request mode (XAJAX_GET or XAJAX_POST), or -1 if
+ * there is none.
+ *
+ * @return mixed
+ */
+ function getRequestMode()
+ {
+ if (!empty($_GET["xajax"]))
+ return XAJAX_GET;
+
+ if (!empty($_POST["xajax"]))
+ return XAJAX_POST;
+
+ return -1;
+ }
+
+ /**
+ * This is the main communications engine of xajax. The engine handles all
+ * incoming xajax requests, calls the apporiate PHP functions (or
+ * class/object methods) and passes the XML responses back to the
+ * Javascript response handler. If your RequestURI is the same as your Web
+ * page then this function should be called before any headers or HTML has
+ * been sent.
+ */
+ function processRequests()
+ {
+
+ $requestMode = -1;
+ $sFunctionName = "";
+ $bFoundFunction = true;
+ $bFunctionIsCatchAll = false;
+ $sFunctionNameForSpecial = "";
+ $aArgs = array();
+ $sPreResponse = "";
+ $bEndRequest = false;
+ $sResponse = "";
+
+ $requestMode = $this->getRequestMode();
+ if ($requestMode == -1) return;
+
+ if ($requestMode == XAJAX_POST)
+ {
+ $sFunctionName = $_POST["xajax"];
+
+ if (!empty($_POST["xajaxargs"]))
+ $aArgs = $_POST["xajaxargs"];
+ }
+ else
+ {
+ header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+ header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+ header ("Cache-Control: no-cache, must-revalidate");
+ header ("Pragma: no-cache");
+
+ $sFunctionName = $_GET["xajax"];
+
+ if (!empty($_GET["xajaxargs"]))
+ $aArgs = $_GET["xajaxargs"];
+ }
+
+ // Use xajax error handler if necessary
+ if ($this->bErrorHandler) {
+ $GLOBALS['xajaxErrorHandlerText'] = "";
+ set_error_handler("xajaxErrorHandler");
+ }
+
+ if ($this->sPreFunction) {
+ if (!$this->_isFunctionCallable($this->sPreFunction)) {
+ $bFoundFunction = false;
+ $objResponse = new xajaxResponse();
+ $objResponse->addAlert("Unknown Pre-Function ". $this->sPreFunction);
+ $sResponse = $objResponse->getXML();
+ }
+ }
+ //include any external dependencies associated with this function name
+ if (array_key_exists($sFunctionName,$this->aFunctionIncludeFiles))
+ {
+ ob_start();
+ include_once($this->aFunctionIncludeFiles[$sFunctionName]);
+ ob_end_clean();
+ }
+
+ if ($bFoundFunction) {
+ $sFunctionNameForSpecial = $sFunctionName;
+ if (!array_key_exists($sFunctionName, $this->aFunctions))
+ {
+ if ($this->sCatchAllFunction) {
+ $sFunctionName = $this->sCatchAllFunction;
+ $bFunctionIsCatchAll = true;
+ }
+ else {
+ $bFoundFunction = false;
+ $objResponse = new xajaxResponse();
+ $objResponse->addAlert("Unknown Function $sFunctionName.");
+ $sResponse = $objResponse->getXML();
+ }
+ }
+ else if ($this->aFunctionRequestTypes[$sFunctionName] != $requestMode)
+ {
+ $bFoundFunction = false;
+ $objResponse = new xajaxResponse();
+ $objResponse->addAlert("Incorrect Request Type.");
+ $sResponse = $objResponse->getXML();
+ }
+ }
+
+ if ($bFoundFunction)
+ {
+ for ($i = 0; $i < sizeof($aArgs); $i++)
+ {
+ // If magic quotes is on, then we need to strip the slashes from the args
+ if (get_magic_quotes_gpc() == 1 && is_string($aArgs[$i])) {
+
+ $aArgs[$i] = stripslashes($aArgs[$i]);
+ }
+ if (stristr($aArgs[$i],"<xjxobj>") != false)
+ {
+ $aArgs[$i] = $this->_xmlToArray("xjxobj",$aArgs[$i]);
+ }
+ else if (stristr($aArgs[$i],"<xjxquery>") != false)
+ {
+ $aArgs[$i] = $this->_xmlToArray("xjxquery",$aArgs[$i]);
+ }
+ else if ($this->bDecodeUTF8Input)
+ {
+ $aArgs[$i] = $this->_decodeUTF8Data($aArgs[$i]);
+ }
+ }
+
+ if ($this->sPreFunction) {
+ $mPreResponse = $this->_callFunction($this->sPreFunction, array($sFunctionNameForSpecial, $aArgs));
+ if (is_array($mPreResponse) && $mPreResponse[0] === false) {
+ $bEndRequest = true;
+ $sPreResponse = $mPreResponse[1];
+ }
+ else {
+ $sPreResponse = $mPreResponse;
+ }
+ if (is_a($sPreResponse, "xajaxResponse")) {
+ $sPreResponse = $sPreResponse->getXML();
+ }
+ if ($bEndRequest) $sResponse = $sPreResponse;
+ }
+
+ if (!$bEndRequest) {
+ if (!$this->_isFunctionCallable($sFunctionName)) {
+ $objResponse = new xajaxResponse();
+ $objResponse->addAlert("The Registered Function $sFunctionName Could Not Be Found.");
+ $sResponse = $objResponse->getXML();
+ }
+ else {
+ if ($bFunctionIsCatchAll) {
+ $aArgs = array($sFunctionNameForSpecial, $aArgs);
+ }
+ $sResponse = $this->_callFunction($sFunctionName, $aArgs);
+ }
+ if (is_a($sResponse, "xajaxResponse")) {
+ $sResponse = $sResponse->getXML();
+ }
+ if (!is_string($sResponse) || strpos($sResponse, "<xjx>") === FALSE) {
+ $objResponse = new xajaxResponse();
+ $objResponse->addAlert("No XML Response Was Returned By Function $sFunctionName.");
+ $sResponse = $objResponse->getXML();
+ }
+ else if ($sPreResponse != "") {
+ $sNewResponse = new xajaxResponse($this->sEncoding, $this->bOutputEntities);
+ $sNewResponse->loadXML($sPreResponse);
+ $sNewResponse->loadXML($sResponse);
+ $sResponse = $sNewResponse->getXML();
+ }
+ }
+ }
+
+ $sContentHeader = "Content-type: text/xml;";
+ if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0)
+ $sContentHeader .= " charset=".$this->sEncoding;
+ header($sContentHeader);
+ if ($this->bErrorHandler && !empty( $GLOBALS['xajaxErrorHandlerText'] )) {
+ $sErrorResponse = new xajaxResponse();
+ $sErrorResponse->addAlert("** PHP Error Messages: **" . $GLOBALS['xajaxErrorHandlerText']);
+ if ($this->sLogFile) {
+ $fH = @fopen($this->sLogFile, "a");
+ if (!$fH) {
+ $sErrorResponse->addAlert("** Logging Error **\n\nxajax was unable to write to the error log file:\n" . $this->sLogFile);
+ }
+ else {
+ fwrite($fH, "** xajax Error Log - " . strftime("%b %e %Y %I:%M:%S %p") . " **" . $GLOBALS['xajaxErrorHandlerText'] . "\n\n\n");
+ fclose($fH);
+ }
+ }
+
+ $sErrorResponse->loadXML($sResponse);
+ $sResponse = $sErrorResponse->getXML();
+
+ }
+ if ($this->bCleanBuffer) while (@ob_end_clean());
+ print $sResponse;
+ if ($this->bErrorHandler) restore_error_handler();
+
+ if ($this->bExitAllowed)
+ exit();
+ }
+
+ /**
+ * Prints the xajax Javascript header and wrapper code into your page by
+ * printing the output of the getJavascript() method. It should only be
+ * called between the <pre><head> </head></pre> tags in your HTML page.
+ * Remember, if you only want to obtain the result of this function, use
+ * {@link xajax::getJavascript()} instead.
+ *
+ * <i>Usage:</i>
+ * <code>
+ * <head>
+ * ...
+ * < ?php $xajax->printJavascript(); ? >
+ * </code>
+ *
+ * @param string the relative address of the folder where xajax has been
+ * installed. For instance, if your PHP file is
+ * "http://www.myserver.com/myfolder/mypage.php"
+ * and xajax was installed in
+ * "http://www.myserver.com/anotherfolder", then $sJsURI
+ * should be set to "../anotherfolder". Defaults to assuming
+ * xajax is in the same folder as your PHP file.
+ * @param string the relative folder/file pair of the xajax Javascript
+ * engine located within the xajax installation folder.
+ * Defaults to xajax_js/xajax.js.
+ */
+ function printJavascript($sJsURI="", $sJsFile=NULL)
+ {
+ print $this->getJavascript($sJsURI, $sJsFile);
+ }
+
+ /**
+ * Returns the xajax Javascript code that should be added to your HTML page
+ * between the <kbd><head> </head></kbd> tags.
+ *
+ * <i>Usage:</i>
+ * <code>
+ * < ?php $xajaxJSHead = $xajax->getJavascript(); ? >
+ * <head>
+ * ...
+ * < ?php echo $xajaxJSHead; ? >
+ * </code>
+ *
+ * @param string the relative address of the folder where xajax has been
+ * installed. For instance, if your PHP file is
+ * "http://www.myserver.com/myfolder/mypage.php"
+ * and xajax was installed in
+ * "http://www.myserver.com/anotherfolder", then $sJsURI
+ * should be set to "../anotherfolder". Defaults to assuming
+ * xajax is in the same folder as your PHP file.
+ * @param string the relative folder/file pair of the xajax Javascript
+ * engine located within the xajax installation folder.
+ * Defaults to xajax_js/xajax.js.
+ * @return string
+ */
+ function getJavascript($sJsURI="", $sJsFile=NULL)
+ {
+ $html = $this->getJavascriptConfig();
+ $html .= $this->getJavascriptInclude($sJsURI, $sJsFile);
+
+ return $html;
+ }
+
+ /**
+ * Returns a string containing inline Javascript that sets up the xajax
+ * runtime (typically called internally by xajax from get/printJavascript).
+ *
+ * @return string
+ */
+ function getJavascriptConfig()
+ {
+ $html = "\t<script type=\"text/javascript\">\n";
+ $html .= "var xajaxRequestUri=\"".$this->sRequestURI."\";\n";
+ $html .= "var xajaxDebug=".($this->bDebug?"true":"false").";\n";
+ $html .= "var xajaxStatusMessages=".($this->bStatusMessages?"true":"false").";\n";
+ $html .= "var xajaxWaitCursor=".($this->bWaitCursor?"true":"false").";\n";
+ $html .= "var xajaxDefinedGet=".XAJAX_GET.";\n";
+ $html .= "var xajaxDefinedPost=".XAJAX_POST.";\n";
+ $html .= "var xajaxLoaded=false;\n";
+
+ foreach($this->aFunctions as $sFunction => $bExists) {
+ $html .= $this->_wrap($sFunction,$this->aFunctionRequestTypes[$sFunction]);
+ }
+
+ $html .= "\t</script>\n";
+ return $html;
+ }
+
+ /**
+ * Returns a string containing a Javascript include of the xajax.js file
+ * along with a check to see if the file loaded after six seconds
+ * (typically called internally by xajax from get/printJavascript).
+ *
+ * @param string the relative address of the folder where xajax has been
+ * installed. For instance, if your PHP file is
+ * "http://www.myserver.com/myfolder/mypage.php"
+ * and xajax was installed in
+ * "http://www.myserver.com/anotherfolder", then $sJsURI
+ * should be set to "../anotherfolder". Defaults to assuming
+ * xajax is in the same folder as your PHP file.
+ * @param string the relative folder/file pair of the xajax Javascript
+ * engine located within the xajax installation folder.
+ * Defaults to xajax_js/xajax.js.
+ * @return string
+ */
+ function getJavascriptInclude($sJsURI="", $sJsFile=NULL)
+ {
+ if ($sJsFile == NULL) $sJsFile = "xajax_js/xajax.js";
+
+ if ($sJsURI != "" && substr($sJsURI, -1) != "/") $sJsURI .= "/";
+
+ $html = "\t<script type=\"text/javascript\" src=\"" . $sJsURI . $sJsFile . "\"></script>\n";
+ $html .= "\t<script type=\"text/javascript\">\n";
+ $html .= "window.setTimeout(function () { if (!xajaxLoaded) { alert('Error: the xajax Javascript file could not be included. Perhaps the URL is incorrect?\\nURL: {$sJsURI}{$sJsFile}'); } }, 6000);\n";
+ $html .= "\t</script>\n";
+ return $html;
+ }
+
+ /**
+ * This method can be used to create a new xajax.js file out of the
+ * xajax_uncompressed.js file (which will only happen if xajax.js doesn't
+ * already exist on the filesystem).
+ *
+ * @param string an optional argument containing the full server file path
+ * of xajax.js.
+ */
+ function autoCompressJavascript($sJsFullFilename=NULL)
+ {
+ $sJsFile = "xajax_js/xajax.js";
+
+ if ($sJsFullFilename) {
+ $realJsFile = $sJsFullFilename;
+ }
+ else {
+ $realPath = realpath(dirname(__FILE__));
+ $realJsFile = $realPath . "/". $sJsFile;
+ }
+
+ // Create a compressed file if necessary
+ if (!file_exists($realJsFile)) {
+ $srcFile = str_replace(".js", "_uncompressed.js", $realJsFile);
+ if (!file_exists($srcFile)) {
+ trigger_error("The xajax uncompressed Javascript file could not be found in the <b>" . dirname($realJsFile) . "</b> folder. Error ", E_USER_ERROR);
+ }
+ require(dirname(__FILE__)."/xajaxCompress.php");
+ $javaScript = implode('', file($srcFile));
+ $compressedScript = xajaxCompressJavascript($javaScript);
+ $fH = @fopen($realJsFile, "w");
+ if (!$fH) {
+ trigger_error("The xajax compressed javascript file could not be written in the <b>" . dirname($realJsFile) . "</b> folder. Error ", E_USER_ERROR);
+ }
+ else {
+ fwrite($fH, $compressedScript);
+ fclose($fH);
+ }
+ }
+ }
+
+ /**
+ * Returns the current URL based upon the SERVER vars.
+ *
+ * @access private
+ * @return string
+ */
+ function _detectURI() {
+ $aURL = array();
+
+ // Try to get the request URL
+ if (!empty($_SERVER['REQUEST_URI'])) {
+ $aURL = parse_url($_SERVER['REQUEST_URI']);
+ }
+
+ // Fill in the empty values
+ if (empty($aURL['scheme'])) {
+ if (!empty($_SERVER['HTTP_SCHEME'])) {
+ $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
+ } else {
+ $aURL['scheme'] = (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http';
+ }
+ }
+
+ if (empty($aURL['host'])) {
+ if (!empty($_SERVER['HTTP_HOST'])) {
+ if (strpos($_SERVER['HTTP_HOST'], ':') > 0) {
+ list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
+ } else {
+ $aURL['host'] = $_SERVER['HTTP_HOST'];
+ }
+ } else if (!empty($_SERVER['SERVER_NAME'])) {
+ $aURL['host'] = $_SERVER['SERVER_NAME'];
+ } else {
+ print "xajax Error: xajax failed to automatically identify your Request URI.";
+ print "Please set the Request URI explicitly when you instantiate the xajax object.";
+ exit();
+ }
+ }
+
+ if (empty($aURL['port']) && !empty($_SERVER['SERVER_PORT'])) {
+ $aURL['port'] = $_SERVER['SERVER_PORT'];
+ }
+
+ if (empty($aURL['path'])) {
+ if (!empty($_SERVER['PATH_INFO'])) {
+ $sPath = parse_url($_SERVER['PATH_INFO']);
+ } else {
+ $sPath = parse_url($_SERVER['PHP_SELF']);
+ }
+ $aURL['path'] = $sPath['path'];
+ unset($sPath);
+ }
+
+ if (!empty($aURL['query'])) {
+ $aURL['query'] = '?'.$aURL['query'];
+ }
+
+ // Build the URL: Start with scheme, user and pass
+ $sURL = $aURL['scheme'].'://';
+ if (!empty($aURL['user'])) {
+ $sURL.= $aURL['user'];
+ if (!empty($aURL['pass'])) {
+ $sURL.= ':'.$aURL['pass'];
+ }
+ $sURL.= '@';
+ }
+
+ // Add the host
+ $sURL.= $aURL['host'];
+
+ // Add the port if needed
+ if (!empty($aURL['port']) && (($aURL['scheme'] == 'http' && $aURL['port'] != 80) || ($aURL['scheme'] == 'https' && $aURL['port'] != 443))) {
+ $sURL.= ':'.$aURL['port'];
+ }
+
+ // Add the path and the query string
+ $sURL.= $aURL['path'].@$aURL['query'];
+
+ // Clean up
+ unset($aURL);
+ return $sURL;
+ }
+
+ /**
+ * Returns true if the function name is associated with an object callback,
+ * false if not.
+ *
+ * @param string the name of the function
+ * @access private
+ * @return boolean
+ */
+ function _isObjectCallback($sFunction)
+ {
+ if (array_key_exists($sFunction, $this->aObjects)) return true;
+ return false;
+ }
+
+ /**
+ * Returns true if the function or object callback can be called, false if
+ * not.
+ *
+ * @param string the name of the function
+ * @access private
+ * @return boolean
+ */
+ function _isFunctionCallable($sFunction)
+ {
+ if ($this->_isObjectCallback($sFunction)) {
+ if (is_object($this->aObjects[$sFunction][0])) {
+ return method_exists($this->aObjects[$sFunction][0], $this->aObjects[$sFunction][1]);
+ }
+ else {
+ return is_callable($this->aObjects[$sFunction]);
+ }
+ }
+ else {
+ return function_exists($sFunction);
+ }
+ }
+
+ /**
+ * Calls the function, class method, or object method with the supplied
+ * arguments.
+ *
+ * @param string the name of the function
+ * @param array arguments to pass to the function
+ * @access private
+ * @return mixed the output of the called function or method
+ */
+ function _callFunction($sFunction, $aArgs)
+ {
+ if ($this->_isObjectCallback($sFunction)) {
+ $mReturn = call_user_func_array($this->aObjects[$sFunction], $aArgs);
+ }
+ else {
+ $mReturn = call_user_func_array($sFunction, $aArgs);
+ }
+ return $mReturn;
+ }
+
+ /**
+ * Generates the Javascript wrapper for the specified PHP function.
+ *
+ * @param string the name of the function
+ * @param mixed the request type
+ * @access private
+ * @return string
+ */
+ function _wrap($sFunction,$sRequestType=XAJAX_POST)
+ {
+ $js = "function ".$this->sWrapperPrefix."$sFunction(){return xajax.call(\"$sFunction\", arguments, ".$sRequestType.");}\n";
+ return $js;
+ }
+
+ /**
+ * Takes a string containing xajax xjxobj XML or xjxquery XML and builds an
+ * array representation of it to pass as an argument to the PHP function
+ * being called.
+ *
+ * @param string the root tag of the XML
+ * @param string XML to convert
+ * @access private
+ * @return array
+ */
+ function _xmlToArray($rootTag, $sXml)
+ {
+ $aArray = array();
+ $sXml = str_replace("<$rootTag>","<$rootTag>|~|",$sXml);
+ $sXml = str_replace("</$rootTag>","</$rootTag>|~|",$sXml);
+ $sXml = str_replace("<e>","<e>|~|",$sXml);
+ $sXml = str_replace("</e>","</e>|~|",$sXml);
+ $sXml = str_replace("<k>","<k>|~|",$sXml);
+ $sXml = str_replace("</k>","|~|</k>|~|",$sXml);
+ $sXml = str_replace("<v>","<v>|~|",$sXml);
+ $sXml = str_replace("</v>","|~|</v>|~|",$sXml);
+ $sXml = str_replace("<q>","<q>|~|",$sXml);
+ $sXml = str_replace("</q>","|~|</q>|~|",$sXml);
+
+ $this->aObjArray = explode("|~|",$sXml);
+
+ $this->iPos = 0;
+ $aArray = $this->_parseObjXml($rootTag);
+
+ return $aArray;
+ }
+
+ /**
+ * A recursive function that generates an array from the contents of
+ * $this->aObjArray.
+ *
+ * @param string the root tag of the XML
+ * @access private
+ * @return array
+ */
+ function _parseObjXml($rootTag)
+ {
+ $aArray = array();
+
+ if ($rootTag == "xjxobj")
+ {
+ while(!stristr($this->aObjArray[$this->iPos],"</xjxobj>"))
+ {
+ $this->iPos++;
+ if(stristr($this->aObjArray[$this->iPos],"<e>"))
+ {
+ $key = "";
+ $value = null;
+
+ $this->iPos++;
+ while(!stristr($this->aObjArray[$this->iPos],"</e>"))
+ {
+ if(stristr($this->aObjArray[$this->iPos],"<k>"))
+ {
+ $this->iPos++;
+ while(!stristr($this->aObjArray[$this->iPos],"</k>"))
+ {
+ $key .= $this->aObjArray[$this->iPos];
+ $this->iPos++;
+ }
+ }
+ if(stristr($this->aObjArray[$this->iPos],"<v>"))
+ {
+ $this->iPos++;
+ while(!stristr($this->aObjArray[$this->iPos],"</v>"))
+ {
+ if(stristr($this->aObjArray[$this->iPos],"<xjxobj>"))
+ {
+ $value = $this->_parseObjXml("xjxobj");
+ $this->iPos++;
+ }
+ else
+ {
+ $value .= $this->aObjArray[$this->iPos];
+ if ($this->bDecodeUTF8Input)
+ {
+ $value = $this->_decodeUTF8Data($value);
+ }
+ }
+ $this->iPos++;
+ }
+ }
+ $this->iPos++;
+ }
+
+ $aArray[$key]=$value;
+ }
+ }
+ }
+
+ if ($rootTag == "xjxquery")
+ {
+ $sQuery = "";
+ $this->iPos++;
+ while(!stristr($this->aObjArray[$this->iPos],"</xjxquery>"))
+ {
+ if (stristr($this->aObjArray[$this->iPos],"<q>") || stristr($this->aObjArray[$this->iPos],"</q>"))
+ {
+ $this->iPos++;
+ continue;
+ }
+ $sQuery .= $this->aObjArray[$this->iPos];
+ $this->iPos++;
+ }
+
+ parse_str($sQuery, $aArray);
+ if ($this->bDecodeUTF8Input)
+ {
+ foreach($aArray as $key => $value)
+ {
+ $aArray[$key] = $this->_decodeUTF8Data($value);
+ }
+ }
+ // If magic quotes is on, then we need to strip the slashes from the
+ // array values because of the parse_str pass which adds slashes
+ if (get_magic_quotes_gpc() == 1) {
+ $newArray = array();
+ foreach ($aArray as $sKey => $sValue) {
+ if (is_string($sValue))
+ $newArray[$sKey] = stripslashes($sValue);
+ else
+ $newArray[$sKey] = $sValue;
+ }
+ $aArray = $newArray;
+ }
+ }
+
+ return $aArray;
+ }
+
+ /**
+ * Decodes string data from UTF-8 to the current xajax encoding.
+ *
+ * @param string data to convert
+ * @access private
+ * @return string converted data
+ */
+ function _decodeUTF8Data($sData)
+ {
+ $sValue = $sData;
+ if ($this->bDecodeUTF8Input)
+ {
+ $sFuncToUse = NULL;
+
+ if (function_exists('iconv'))
+ {
+ $sFuncToUse = "iconv";
+ }
+ else if (function_exists('mb_convert_encoding'))
+ {
+ $sFuncToUse = "mb_convert_encoding";
+ }
+ else if ($this->sEncoding == "ISO-8859-1")
+ {
+ $sFuncToUse = "utf8_decode";
+ }
+ else
+ {
+ trigger_error("The incoming xajax data could not be converted from UTF-8", E_USER_NOTICE);
+ }
+
+ if ($sFuncToUse)
+ {
+ if (is_string($sValue))
+ {
+ if ($sFuncToUse == "iconv")
+ {
+ $sValue = iconv("UTF-8", $this->sEncoding.'//TRANSLIT', $sValue);
+ }
+ else if ($sFuncToUse == "mb_convert_encoding")
+ {
+ $sValue = mb_convert_encoding($sValue, $this->sEncoding, "UTF-8");
+ }
+ else
+ {
+ $sValue = utf8_decode($sValue);
+ }
+ }
+ }
+ }
+ return $sValue;
+ }
+
+}// end class xajax
+
+/**
+ * This function is registered with PHP's set_error_handler() function if
+ * the xajax error handling system is turned on.
+ */
+function xajaxErrorHandler($errno, $errstr, $errfile, $errline)
+{
+ $errorReporting = error_reporting();
+ if (($errno & $errorReporting) == 0) return;
+
+ if ($errno == E_NOTICE) {
+ $errTypeStr = "NOTICE";
+ }
+ else if ($errno == E_WARNING) {
+ $errTypeStr = "WARNING";
+ }
+ else if ($errno == E_USER_NOTICE) {
+ $errTypeStr = "USER NOTICE";
+ }
+ else if ($errno == E_USER_WARNING) {
+ $errTypeStr = "USER WARNING";
+ }
+ else if ($errno == E_USER_ERROR) {
+ $errTypeStr = "USER FATAL ERROR";
+ }
+ else if ($errno == E_STRICT) {
+ return;
+ }
+ else {
+ $errTypeStr = "UNKNOWN: $errno";
+ }
+ $GLOBALS['xajaxErrorHandlerText'] .= "\n----\n[$errTypeStr] $errstr\nerror in line $errline of file $errfile";
+}
+
+?>
\ No newline at end of file
Added: trunk/rapc/include/xajaxCompress.php
===================================================================
--- trunk/rapc/include/xajaxCompress.php (rev 0)
+++ trunk/rapc/include/xajaxCompress.php 2006-11-07 13:05:49 UTC (rev 6)
@@ -0,0 +1,182 @@
+<?php
+/**
+ * xajaxCompress.php :: function to compress Javascript
+ *
+ * xajax version 0.2.4
+ * copyright (c) 2005 by Jared White & J. Max Wilson
+ * http://www.xajaxproject.org
+ *
+ * xajax is an open source PHP class library for easily creating powerful
+ * PHP-driven, web-based Ajax Applications. Using xajax, you can asynchronously
+ * call PHP functions and update the content of your your webpage without
+ * reloading the page.
+ *
+ * xajax is released under the terms of the LGPL license
+ * http://www.gnu.org/copyleft/lesser.html#SEC3
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @package xajax
+ * @version $Id$
+ * @copyright Copyright (c) 2005-2006 by Jared White & J. Max Wilson
+ * @license http://www.gnu.org/copyleft/lesser.html#SEC3 LGPL License
+ */
+
+/**
+ * Compresses the Javascript code for more efficient delivery.
+ * (used internally)
+ *
+ * @param string contains the Javascript code to compress
+ */
+function xajaxCompressJavascript($sJS)
+{
+ //remove windows cariage returns
+ $sJS = str_replace("\r","",$sJS);
+
+ //array to store replaced literal strings
+ $literal_strings = array();
+
+ //explode the string into lines
+ $lines = explode("\n",$sJS);
+ //loop through all the lines, building a new string at the same time as removing literal strings
+ $clean = "";
+ $inComment = false;
+ $literal = "";
+ $inQuote = false;
+ $escaped = false;
+ $quoteChar = "";
+
+ for($i=0;$i<count($lines);$i++)
+ {
+ $line = $lines[$i];
+ $inNormalComment = false;
+
+ //loop through line's characters and take out any literal strings, replace them with ___i___ where i is the index of this string
+ for($j=0;$j<strlen($line);$j++)
+ {
+ $c = substr($line,$j,1);
+ $d = substr($line,$j,2);
+
+ //look for start of quote
+ if(!$inQuote && !$inComment)
+ {
+ //is this character a quote or a comment
+ if(($c=="\"" || $c=="'") && !$inComment && !$inNormalComment)
+ {
+ $inQuote = true;
+ $inComment = false;
+ $escaped = false;
+ $quoteChar = $c;
+ $literal = $c;
+ }
+ else if($d=="/*" && !$inNormalComment)
+ {
+ $inQuote = false;
+ $inComment = true;
+ $escaped = false;
+ $quoteChar = $d;
+ $literal = $d;
+ $j++;
+ }
+ else if($d=="//") //ignore string markers that are found inside comments
+ {
+ $inNormalComment = true;
+ $clean .= $c;
+ }
+ else
+ {
+ $clean .= $c;
+ }
+ }
+ else //allready in a string so find end quote
+ {
+ if($c == $quoteChar && !$escaped && !$inComment)
+ {
+ $inQuote = false;
+ $literal .= $c;
+
+ //subsitute in a marker for the string
+ $clean .= "___" . count($literal_strings) . "___";
+
+ //push the string onto our array
+ array_push($literal_strings,$literal);
+
+ }
+ else if($inComment && $d=="*/")
+ {
+ $inComment = false;
+ $literal .= $d;
+
+ //subsitute in a marker for the string
+ $clean .= "___" . count($literal_strings) . "___";
+
+ //push the string onto our array
+ array_push($literal_strings,$literal);
+
+ $j++;
+ }
+ else if($c == "\\" && !$escaped)
+ $escaped = true;
+ else
+ $escaped = false;
+
+ $literal .= $c;
+ }
+ }
+ if($inComment) $literal .= "\n";
+ $clean .= "\n";
+ }
+ //explode the clean string into lines again
+ $lines = explode("\n",$clean);
+
+ //now process each line at a time
+ for($i=0;$i<count($lines);$i++)
+ {
+ $line = $lines[$i];
+
+ //remove comments
+ $line = preg_replace("/\/\/(.*)/","",$line);
+
+ //strip leading and trailing whitespace
+ $line = trim($line);
+
+ //remove all whitespace with a single space
+ $line = preg_replace("/\s+/"," ",$line);
+
+ //remove any whitespace that occurs after/before an operator
+ $line = preg_replace("/\s*([!\}\{;,&=\|\-\+\*\/\)\(:])\s*/","\\1",$line);
+
+ $lines[$i] = $line;
+ }
+
+ //implode the lines
+ $sJS = implode("\n",$lines);
+
+ //make sure there is a max of 1 \n after each line
+ $sJS = preg_replace("/[\n]+/","\n",$sJS);
+
+ //strip out line breaks that immediately follow a semi-colon
+ $sJS = preg_replace("/;\n/",";",$sJS);
+
+ //curly brackets aren't on their own
+ $sJS = preg_replace("/[\n]*\{[\n]*/","{",$sJS);
+
+ //finally loop through and replace all the literal strings:
+ for($i=0;$i<count($literal_strings);$i++)
+ $sJS = str_replace("___".$i."___",$literal_strings[$i],$sJS);
+
+ return $sJS;
+}
+?>
\ No newline at end of file
Added: trunk/rapc/include/xajaxResponse.inc.php
===================================================================
--- trunk/rapc/include/xajaxResponse.inc.php (rev 0)
+++ trunk/rapc/include/xajaxResponse.inc.php 2006-11-07 13:05:49 UTC (rev 6)
@@ -0,0 +1,580 @@
+<?php
+/**
+ * xajaxResponse.inc.php :: xajax XML response class
+ *
+ * xajax version 0.2.4
+ * copyright (c) 2005 by Jared White & J. Max Wilson
+ * http://www.xajaxproject.org
+ *
+ * xajax is an open source PHP class library for easily creating powerful
+ * PHP-driven, web-based Ajax Applications. Using xajax, you can asynchronously
+ * call PHP functions and update the content of your your webpage without
+ * reloading the page.
+ *
+ * xajax is released under the terms of the LGPL license
+ * http://www.gnu.org/copyleft/lesser.html#SEC3
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @package xajax
+ * @version $Id$
+ * @copyright Copyright (c) 2005-2006 by Jared White & J. Max Wilson
+ * @license http://www.gnu.org/copyleft/lesser.html#SEC3 LGPL License
+ */
+
+/*
+ ----------------------------------------------------------------------------
+ | Online documentation for this class is available on the xajax wiki at: |
+ | http://wiki.xajaxproject.org/Documentation:xajaxResponse.inc.php |
+ ----------------------------------------------------------------------------
+*/
+
+/**
+ * The xajaxResponse class is used to create responses to be sent back to your
+ * Web page. A response contains one or more command messages for updating
+ * your page.
+ * Currently xajax supports 21 kinds of command messages, including some common
+ * ones such as:
+ * <ul>
+ * <li>Assign - sets the specified attribute of an element in your page</li>
+ * <li>Append - appends data to the end of the specified attribute of an
+ * element in your page</li>
+ * <li>Prepend - prepends data to the beginning of the specified attribute of
+ * an element in your page</li>
+ * <li>Replace - searches for and replaces data in the specified attribute of
+ * an element in your page</li>
+ * <li>Script - runs the supplied JavaScript code</li>
+ * <li>Alert - shows an alert box with the supplied message text</li>
+ * </ul>
+ *
+ * <i>Note:</i> elements are identified by their HTML id, so if you don't see
+ * your browser HTML display changing from the request, make sure you're using
+ * the right id names in your response.
+ *
+ * @package xajax
+ */
+class xajaxResponse
+{
+ /**#@+
+ * @access protected
+ */
+ /**
+ * @var string internal XML storage
+ */
+ var $xml;
+ /**
+ * @var string the encoding type to use
+ */
+ var $sEncoding;
+ /**
+ * @var boolean if special characters in the XML should be converted to
+ * entities
+ */
+ var $bOutputEntities;
+
+ /**#@-*/
+
+ /**
+ * The constructor's main job is to set the character encoding for the
+ * response.
+ *
+ * <i>Note:</i> to change the character encoding for all of the
+ * responses, set the XAJAX_DEFAULT_ENCODING constant before you
+ * instantiate xajax.
+ *
+ * @param string contains the character encoding string to use
+ * @param boolean lets you set if you want special characters in the output
+ * converted to HTML entities
+ *
+ */
+ function xajaxResponse($sEncoding=XAJAX_DEFAULT_CHAR_ENCODING, $bOutputEntities=false)
+ {
+ $this->setCharEncoding($sEncoding);
+ $this->bOutputEntities = $bOutputEntities;
+ }
+
+ /**
+ * Sets the character encoding for the response based on $sEncoding, which
+ * is a string containing the character encoding to use. You don't need to
+ * use this method normally, since the character encoding for the response
+ * gets set automatically based on the XAJAX_DEFAULT_CHAR_ENCODING
+ * constant.
+ *
+ * @param string
+ */
+ function setCharEncoding($sEncoding)
+ {
+ $this->sEncoding = $sEncoding;
+ }
+
+ /**
+ * Tells the response object to convert special characters to HTML entities
+ * automatically (only works if the mb_string extension is available).
+ */
+ function outputEntitiesOn()
+ {
+ $this->bOutputEntities = true;
+ }
+
+ /**
+ * Tells the response object to output special characters intact. (default
+ * behavior)
+ */
+ function outputEntitiesOff()
+ {
+ $this->bOutputEntities = false;
+ }
+
+ /**
+ * Adds a confirm commands command message to the XML response.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addConfirmCommands(1, "Do you want to preview the new data?");</kbd>
+ *
+ * @param integer the number of commands to skip if the user presses
+ * Cancel in the browsers's confirm dialog
+ * @param string the message to show in the browser's confirm dialog
+ */
+ function addConfirmCommands($iCmdNumber, $sMessage)
+ {
+ $this->xml .= $this->_cmdXML(array("n"=>"cc","t"=>$iCmdNumber),$sMessage);
+ }
+
+ /**
+ * Adds an assign command message to the XML response.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addAssign("contentDiv", "innerHTML", "Some Text");</kbd>
+ *
+ * @param string contains the id of an HTML element
+ * @param string the part of the element you wish to modify ("innerHTML",
+ * "value", etc.)
+ * @param string the data you want to set the attribute to
+ */
+ function addAssign($sTarget,$sAttribute,$sData)
+ {
+ $this->xml .= $this->_cmdXML(array("n"=>"as","t"=>$sTarget,"p"=>$sAttribute),$sData);
+ }
+
+ /**
+ * Adds an append command message to the XML response.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addAppend("contentDiv", "innerHTML", "Some New Text");</kbd>
+ *
+ * @param string contains the id of an HTML element
+ * @param string the part of the element you wish to modify ("innerHTML",
+ * "value", etc.)
+ * @param string the data you want to append to the end of the attribute
+ */
+ function addAppend($sTarget,$sAttribute,$sData)
+ {
+ $this->xml .= $this->_cmdXML(array("n"=>"ap","t"=>$sTarget,"p"=>$sAttribute),$sData);
+ }
+
+ /**
+ * Adds an prepend command message to the XML response.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addPrepend("contentDiv", "innerHTML", "Some Starting Text");</kbd>
+ *
+ * @param string contains the id of an HTML element
+ * @param string the part of the element you wish to modify ("innerHTML",
+ * "value", etc.)
+ * @param string the data you want to prepend to the beginning of the
+ * attribute
+ */
+ function addPrepend($sTarget,$sAttribute,$sData)
+ {
+ $this->xml .= $this->_cmdXML(array("n"=>"pp","t"=>$sTarget,"p"=>$sAttribute),$sData);
+ }
+
+ /**
+ * Adds a replace command message to the XML response.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addReplace("contentDiv", "innerHTML", "text", "<b>text</b>");</kbd>
+ *
+ * @param string contains the id of an HTML element
+ * @param string the part of the element you wish to modify ("innerHTML",
+ * "value", etc.)
+ * @param string the string to search for
+ * @param string the string to replace the search string when found in the
+ * attribute
+ */
+ function addReplace($sTarget,$sAttribute,$sSearch,$sData)
+ {
+ $sDta = "<s><![CDATA[$sSearch]]></s><r><![CDATA[$sData]]></r>";
+ $this->xml .= $this->_cmdXML(array("n"=>"rp","t"=>$sTarget,"p"=>$sAttribute),$sDta);
+ }
+
+ /**
+ * Adds a clear command message to the XML response.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addClear("contentDiv", "innerHTML");</kbd>
+ *
+ * @param string contains the id of an HTML element
+ * @param string the part of the element you wish to clear ("innerHTML",
+ * "value", etc.)
+ */
+ function addClear($sTarget,$sAttribute)
+ {
+ $this->addAssign($sTarget,$sAttribute,'');
+ }
+
+ /**
+ * Adds an alert command message to the XML response.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addAlert("This is important information");</kbd>
+ *
+ * @param string the text to be displayed in the Javascript alert box
+ */
+ function addAlert($sMsg)
+ {
+ $this->xml .= $this->_cmdXML(array("n"=>"al"),$sMsg);
+ }
+
+ /**
+ * Uses the addScript() method to add a Javascript redirect to another URL.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addRedirect("http://www.xajaxproject.org");</kbd>
+ *
+ * @param string the URL to redirect the client browser to
+ */
+ function addRedirect($sURL)
+ {
+ //we need to parse the query part so that the values are rawurlencode()'ed
+ //can't just use parse_url() cos we could be dealing with a relative URL which
+ // parse_url() can't deal with.
+ $queryStart = strpos($sURL, '?', strrpos($sURL, '/'));
+ if ($queryStart !== FALSE)
+ {
+ $queryStart++;
+ $queryEnd = strpos($sURL, '#', $queryStart);
+ if ($queryEnd === FALSE)
+ $queryEnd = strlen($sURL);
+ $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
+ parse_str($queryPart, $queryParts);
+ $newQueryPart = "";
+ foreach($queryParts as $key => $value)
+ {
+ $newQueryPart .= rawurlencode($key).'='.rawurlencode($value).ini_get('arg_separator.output');
+ }
+ $sURL = str_replace($queryPart, $newQueryPart, $sURL);
+ }
+ $this->addScript('window.location = "'.$sURL.'";');
+ }
+
+ /**
+ * Adds a Javascript command message to the XML response.
+ *
+ * <i>Usage:</i> <kbd>$objResponse->addScrip...
[truncated message content] |
|
From: <mah...@us...> - 2006-11-14 06:04:17
|
Revision: 10
http://svn.sourceforge.net/rapc/?rev=10&view=rev
Author: maher_karim
Date: 2006-11-13 22:04:01 -0800 (Mon, 13 Nov 2006)
Log Message:
-----------
2006-11-13 Maher Abdel karim <mah...@do...>
* conf/dccssconfig.php.default:
* conf/dccssconfig.php.default:Adjust parameter to save loaded images.
* conf/identifyplugin.php:
* conf/identifyplugin.php.default:Adjust layer name and path for plugin.
* print.php:added the possibility to print inspection sheets.
* rapc.nsi:adjust installer to include xajax folder and files.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/conf/identifyplugin.ini.default
trunk/rapc/conf/rapc_en.map
trunk/rapc/print.php
trunk/rapc/rapc.nsi
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2006-11-09 05:59:28 UTC (rev 9)
+++ trunk/rapc/changelog 2006-11-14 06:04:01 UTC (rev 10)
@@ -1,3 +1,12 @@
+2006-11-13 Maher Abdel karim <mah...@do...>
+
+ * conf/dccssconfig.php.default:
+ * conf/dccssconfig.php.default:Adjust parameter to save loaded images.
+ * conf/identifyplugin.php:
+ * conf/identifyplugin.php.default:Adjust layer name and path for plugin.
+ * print.php:added the possibility to print inspection sheets.
+ * rapc.nsi:adjust installer to include xajax folder and files.
+
2006-11-6 Maher Abdel karim <mah...@do...>
* address_confirmation.php:fix to deal with multiple results, and zoom to
Modified: trunk/rapc/conf/identifyplugin.ini.default
===================================================================
--- trunk/rapc/conf/identifyplugin.ini.default 2006-11-09 05:59:28 UTC (rev 9)
+++ trunk/rapc/conf/identifyplugin.ini.default 2006-11-14 06:04:01 UTC (rev 10)
@@ -9,10 +9,10 @@
[Plugin1]
; Location of the image files in the file system (A directory).
; The token '%s' will be replaced by field value
-ImageLocation = "c:\program files\dccss\data\plugin\%s\"
+ImageLocation = "c:\program files\rapc\data\plugin\%s\"
; Location of the image files on the web server. A (preferably relative) URL.
; The token '%s' will be replaced by field value.
-ImageLocationURL = "/dccss/data/plugin/%s/";
+ImageLocationURL = "/rapc/data/plugin/%s/";
; Pattern to filter directory contents.
; A PERL regular expression.
Pattern = "/.*\.[jJ][pP][gG]$/"
Modified: trunk/rapc/conf/rapc_en.map
===================================================================
--- trunk/rapc/conf/rapc_en.map 2006-11-09 05:59:28 UTC (rev 9)
+++ trunk/rapc/conf/rapc_en.map 2006-11-14 06:04:01 UTC (rev 10)
@@ -111,7 +111,11 @@
CLASS
NAME 'Adminsub.shp'
TEMPLATE 'template.html'
-
+ #RASTERFILL_STYLE_SOLID
+ STYLE
+ #COLOR 255 251 195
+ BACKGROUNDCOLOR 255 255 255
+ END #STYLE
#OUTLINE SYMBOL
STYLE
OUTLINECOLOR 0 0 0
Modified: trunk/rapc/print.php
===================================================================
--- trunk/rapc/print.php 2006-11-09 05:59:28 UTC (rev 9)
+++ trunk/rapc/print.php 2006-11-14 06:04:01 UTC (rev 10)
@@ -79,8 +79,8 @@
<table border="1" summary="Map" width="98%" height="80%" cellspacing="0"
cellpadding="0" nowrap="nowrap">
<tr>
-
- <td width="90%" height="80%" valign="top"> <?php
+
+ <td width="90%" height="80%" valign="top"> <?php
if ($_REQUEST['action']!='AC'){
$map_path="./";
$map = ms_newMapObj($map_path.sprintf($_SESSION["strMapFile"],
@@ -195,12 +195,24 @@
$image_url ?>" alt="Workorder Map" style="width: 33cm; height: 25cm;"/></a>
</td>
+ <?php
+ if (($_REQUEST['vill_no']!=0) && ($_REQUEST['vill_no']!='')){
+ echo ('<td><table>');
+ echo('<tr><td>Village No.:'.$_REQUEST['vill_no'].'</td></tr>');
+ echo('<tr><td>Block No.:'.$_REQUEST['block'].'</td></tr>');
+ echo('<tr><td>Sector No.:'.$_REQUEST['sector'].'</td></tr>');
+ echo('<tr><td>Plot No.:'.$_REQUEST['plot'].'</td></tr>');
+ echo('</table></td>');}
+ ?>
</tr>
- <tr><td><IMG SRC=<?=$url?> BORDER=0 ></td>
- <td><img alt="North arrow" src="images/northarrow.png" ></td>
+ <tr><td>
+ <table><tr><td><IMG SRC=<?=$url?> BORDER=0 ></td>
+ <td><img width=25 height=25 alt="North arrow" src="images/northarrow.png" ></td></tr></table></td>
+
</tr>
+
</table>
Modified: trunk/rapc/rapc.nsi
===================================================================
--- trunk/rapc/rapc.nsi 2006-11-09 05:59:28 UTC (rev 9)
+++ trunk/rapc/rapc.nsi 2006-11-14 06:04:01 UTC (rev 10)
@@ -234,6 +234,7 @@
File "include\dcmpostgis.php"
File "include\header.php"
File "include\i18n.php"
+ File "include\xajax*.*"
IfFileExists "$INSTDIR\conf\dccssconfig.php" keep_config
File /oname=dccssconfig.php "conf\dccssconfig.php.default"
; Write PGCLIENTBINDIRECTORY to dcmconfig.php
@@ -246,6 +247,9 @@
File "include\dataobject\RAPC.links.ini"
File "include\dataobject\*.php"
+ SetOutPath "$INSTDIR\include\xajax_js"
+ File "include\xajax_js\*.js"
+
SetOutPath "$INSTDIR\doc\administration"
File "doc\administration\RAPC_administration_guide.pdf"
File "doc\administration\RAPC_administration_guide.chm"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-11-14 06:04:53
|
Revision: 10
http://svn.sourceforge.net/rapc/?rev=10&view=rev
Author: maher_karim
Date: 2006-11-13 22:04:01 -0800 (Mon, 13 Nov 2006)
Log Message:
-----------
2006-11-13 Maher Abdel karim <mah...@do...>
* conf/dccssconfig.php.default:
* conf/dccssconfig.php.default:Adjust parameter to save loaded images.
* conf/identifyplugin.php:
* conf/identifyplugin.php.default:Adjust layer name and path for plugin.
* print.php:added the possibility to print inspection sheets.
* rapc.nsi:adjust installer to include xajax folder and files.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/conf/identifyplugin.ini.default
trunk/rapc/conf/rapc_en.map
trunk/rapc/print.php
trunk/rapc/rapc.nsi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-11-14 07:29:55
|
Revision: 11
http://svn.sourceforge.net/rapc/?rev=11&view=rev
Author: maher_karim
Date: 2006-11-13 23:29:50 -0800 (Mon, 13 Nov 2006)
Log Message:
-----------
2006-11-14 Maher Abdel karim <mah...@do...>
* script/create_rapc_ddl.sql: add boolrow to panel table.remove permitdate
* include/dataobject/rapc.ini:
* include/dataobject/rapc.links.ini:added boolrow to panel table.
* include/dataobject/public_panel.php:add boolrow, and related functions
Modified Paths:
--------------
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/dataobject/rapc.ini
trunk/rapc/include/dataobject/rapc.links.ini
trunk/rapc/script/create_rapc_ddl.sql
Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php 2006-11-14 06:04:01 UTC (rev 10)
+++ trunk/rapc/include/dataobject/Public_panel.php 2006-11-14 07:29:50 UTC (rev 11)
@@ -58,7 +58,9 @@
var $username;
var $insertdate;
var $permitno;
- var $permitdate;
+ var $image;
+ var $regiterno;
+ var $boolrow;
/* ZE2 compatibility trick*/
function __clone() { return $this;}
@@ -80,7 +82,7 @@
return array_merge(parent::table(), $hierselects);
}
var $fb_textFields = array('notes','address','notesonlocation','panelsubject');
- var $fb_fieldsToRender = array( 'panelcatagory','companyname','ownership',
+ var $fb_fieldsToRender = array( 'registerno','panelcatagory','companyname','ownership',
'nationalno', 'mothername',
'address', 'teleno', 'faxno',
'mobileno', 'pobox', 'panelsubject','road_route_district',
@@ -90,19 +92,20 @@
'lightavailable','facecount','paneltypedimension',
'panelarea','annualfees','usefees','totalfees','agreedby','receiptno',
'receiptdate','insurancereceiptno','insurancereceiptdate',
- 'contractno','notes','idroadiddistrict','permitno','permitdate');
+ 'contractno','notes','idroadiddistrict','permitno','image','boolrow');
var $fb_preDefOrder = array( 'companyname','panelcatagory', 'ownership',
+ 'registerno',
'nationalno', 'mothername',
'address', 'teleno', 'faxno',
'mobileno', 'pobox', 'panelsubject','road_route_district', 'carrigewaywidth',
'shoulderwidth', 'numberoflanes',
'medianwidth','date','routetodistance','x','y',
'routedirection','notesonlocation','paneltodistance','nearstpanelx','nearstpanely',
- 'lightavailable','facecount','paneltypedimension',
- 'panelarea','annualfees','usefees','totalfees','agreedby','permitno','permitdate','receiptno',
+ 'lightavailable','facecount','boolrow','paneltypedimension',
+ 'panelarea','annualfees','usefees','totalfees','agreedby','permitno','receiptno',
'receiptdate','insurancereceiptno','insurancereceiptdate',
- 'contractno','notes','idroadiddistrict');
+ 'contractno','notes','image','idroadiddistrict');
var $fb_linkElementTypes = array('facecount' => 'radio');
var $fb_enumFields = array('facecount');
@@ -169,11 +172,11 @@
'numeric', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('paneltypedimension', _('Please select the panel type and dimension.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
- $form->addRule('permitdate', _('Please select the permission date.'),
- 'required', null, $_SESSION["strHtmlQuickFormValidation"]);
+
$form->addRule('permitno', _('Please select the permission no.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
- $form->addRule('annualfees', _('Please enter the annual fees.'),
+
+ /*$form->addRule('annualfees', _('Please enter the annual fees.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('usefees', _('Please enter the use fees.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
@@ -181,17 +184,14 @@
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
$form->addRule('panelarea', _('Please enter panel area.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
+ */
+
+ //from Areejs comments
- $form->addRule('annualfees', _('Please enter the annual fees.'),
- 'nonzero', null, $_SESSION["strHtmlQuickFormValidation"]);
- $form->addRule('usefees', _('Please enter the use fees.'),
- 'nonzero', null, $_SESSION["strHtmlQuickFormValidation"]);
- $form->addRule('totalfees', _('Please enter the total fees.'),
- 'nonzero', null, $_SESSION["strHtmlQuickFormValidation"]);
- $form->addRule('panelarea', _('Please enter panel area.'),
- 'nonzero', null, $_SESSION["strHtmlQuickFormValidation"]);
- //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.'),
@@ -218,9 +218,23 @@
$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'),
+ 'numeric',null,'client');
+ $form->addRule('usefees', _('Please select the panel dimension, the value should not be zero'),
+ 'numeric',null,'client');
+
+ $form->addRule('annualfees', _('Please select the panel dimension, the value should not be zero'),
+ 'nonzero',null,'client');
+ $form->addRule('panelarea', _('Please select the panel dimension, the value should not be zero'),
+ 'nonzero',null,'client');
+ $form->addRule('usefees', _('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);
@@ -228,15 +242,17 @@
'maxlength',32);
$form->addRule('address', _('The Address should be 125 letters max.'),
- 'maxlength',125);
- $form->addRule('telno', _('The Entered value should 32 letters max.'),
- 'maxlength',32);
- $form->addRule('faxno', _('The Entered value should 32 letters max.'),
- 'maxlength',32);
- $form->addRule('pobox', _('The Entered value should 32 letters max.'),
- 'maxlength',32,'client');
- $form->addRule('panelsubject', _('The Entered value should 32 letters max.'),
'maxlength',125,'client');
+ $form->addRule('telno', _('The Entered telephone value should 10 letters max.'),
+ 'maxlength',10,'client');
+ $form->addRule('faxno', _('The Entered fax no should 10 letters max.'),
+ 'maxlength',10,'client');
+ $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');
+ $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.'),
'rangelength',array(0,1),'client');
$form->addRule('numberoflanes', _('The entered number of lanes value should be between 1 and 8.'),
@@ -270,26 +286,12 @@
$form->addRule('notes', _('The entered value should be 125 letters max.'),'maxlength',
125);
- $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'),
- 'numeric',null,'client');
- $form->addRule('usefees', _('Please select the panel dimension, the value should not be zero'),
- 'numeric',null,'client');
- $form->addRule('annualfees', _('Please select the panel dimension, the value should not be zero'),
- 'nonzero',null,'client');
- $form->addRule('panelarea', _('Please select the panel dimension, the value should not be zero'),
- 'nonzero',null,'client');
- $form->addRule('usefees', _('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');
-
+ $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));
+ $form->setDefaults(array('panelcatagory'=>3,'facecount'=>1,'boolrow'=>1));
}
function update($do = false) {
@@ -298,6 +300,7 @@
$this->paneldimension=substr($_POST['paneltypedimension'][2],-1);
$this->x=$this->x;
$this->y=$this->y;
+ //$this->image='test';
}
return parent::update($do);
@@ -310,6 +313,8 @@
$this->paneldimension=substr($_POST['paneltypedimension'][2],-1);
$this->x=$this->x;
$this->y=$this->y;
+ // $this->image='test';
+
}
@@ -322,13 +327,14 @@
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('panelcatagory' =>_('Panel Catagory:'),
- 'companyname' => _('Company Name:'),'ownership' => _('Ownership:'),
+
+ $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.:'),
'mobileno'=>_('Mobile No.:'),'pobox'=>_('Post box:'),
@@ -349,8 +355,9 @@
'insurancereceiptno'=>_('Insurance Receipt No.:'),
'insurancereceiptdate'=>_('Insurance Receipt Date:'),'contractno'=>_('Contract No:'),
'notes'=>_('Notes:'),'permitno'=>_('Permission No.:'),
- 'permitdate'=>_('Permission Date:'));
+ 'registerno'=>_('Registeration No.:'),'boolrow'=>_('Right of Way'));
+
$this->fb_formHeaderText= _('Advertisement Panel Information Data Entry');
$this->fb_preDefElements = array();
$this->fb_ruleViolationMessage = _('%s: The value you have entered is not valid.');
@@ -371,32 +378,34 @@
<!--
function setitems(val){
if (val==1){
- document.forms[2][53].disabled=false
+ document.forms[2].contractno.disabled=false
}
if (val==3){
- document.forms[2][1].disabled=false
- document.forms[2][3].disabled=true
- document.forms[2][4].disabled=false
- document.forms[2][5].disabled=false
- document.forms[2][6].disabled=false
- document.forms[2][7].disabled=false
- document.forms[2][8].disabled=false
- document.forms[2][9].disabled=false
- document.forms[2][10].disabled=false
- document.forms[2][53].disabled=true
+ document.forms[2].companyname.disabled=false
+ document.forms[2].registerno.disabled=false
+ document.forms[2].ownership.disabled=true
+ document.forms[2].nationalno.disabled=false
+ document.forms[2].mothername.disabled=false
+ document.forms[2].address.disabled=false
+ document.forms[2].teleno.disabled=false
+ document.forms[2].faxno.disabled=false
+ document.forms[2].mobileno.disabled=false
+ document.forms[2].pobox.disabled=false
+ document.forms[2].contractno.disabled=true
}
if (val==2){
- document.forms[2][1].disabled=true
- document.forms[2][3].disabled=false
- document.forms[2][4].disabled=true
- document.forms[2][5].disabled=true
- document.forms[2][6].disabled=true
- document.forms[2][7].disabled=true
- document.forms[2][8].disabled=true
- document.forms[2][9].disabled=true
- document.forms[2][10].disabled=true
- document.forms[2][53].disabled=true
+ document.forms[2].companyname.disabled=true
+ document.forms[2].registerno.disabled=true
+ document.forms[2].ownership.disabled=false
+ document.forms[2].nationalno.disabled=true
+ document.forms[2].mothername.disabled=true
+ document.forms[2].address.disabled=true
+ document.forms[2].telenodisabled=true
+ document.forms[2].faxno.disabled=true
+ document.forms[2].mobileno.disabled=true
+ document.forms[2].pobox.disabled=true
+ document.forms[2].contractno.disabled=true
}
@@ -406,25 +415,26 @@
//alert (val);
var passed = val;
- //document.forms[2].panelarea.value="val";
- //document.forms[2].panelarea.value="val";
- //alert (document.forms[2][32].value);
+
var xpanel;
- var Startindex = document.forms[2][35].value.search(/ /);
- var Startannual = document.forms[2][35].value.search(/-/);
- xpanel=document.forms[2][35].value.substr(0,Startindex);
- var ypanel=document.forms[2][35].value.substr(Startindex+2,Startannual-(Startindex+2));
+ 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.
- //document.forms[2].panelarea.value=document.forms[2][35].value;
- document.forms[2].panelarea.value=(ypanel*xpanel);
- var StartUse = document.forms[2][35].value.search(/M/);
- var StartPanel = document.forms[2][35].value.search(/P/);
+ //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][35].value.substr(Startannual+1,StartUse-(Startannual+1));
+ document.forms[2].annualfees.value=document.forms[2][38].value.substr(Startannual+1,StartUse-(Startannual+1));
////Check the Use fees
- document.forms[2].usefees.value=document.forms[2][35].value.substr(StartUse+1,StartPanel-(StartUse+1));
- var annualfees = (document.forms[2][35].value.substr(Startannual+1,StartUse-(Startannual+1)));
- var usefees=document.forms[2][35].value.substr(StartUse+1);
+ 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)
@@ -439,28 +449,16 @@
}
//alert (facecount);
- var startmonth=document.forms[2][20].value;
+ var startmonth=document.forms[2][22].value;
//alert (startmonth);
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 ';
- document.forms[2].totalfees.disabled=true;
- if (applicationtype=="new"){
- document.forms[2].totalfees.disabled=true;
- document.forms[2].usefees.disabled=true;
- document.forms[2].panelarea.disabled=true;
- document.forms[2].annualfees.disabled=true;
-
- }else{
- document.forms[2].totalfees.disabled=false;
- document.forms[2].usefees.disabled=false;
- document.forms[2].panelarea.disabled=false;
- document.forms[2].annualfees.disabled=false;
- }
+
}
}
@@ -468,13 +466,39 @@
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)
+ return document.forms[2].facecount.value;
+ else
+ return "";
+ for(var i = 0; i < document.forms[2].facecount.length; i++) {
+ if(document.forms[2].facecount[i].checked) {
+ var facecount= document.forms[2].facecount[i].value;
+ }
+ }
+
+
+ var usefees2=parseInt(document.forms[2].usefees.value);
+ var startmonth=document.forms[2][22].value;
+ var totalfeesclick = (((panelarea2*annualfees2)*facecount)+usefees2)*((13-startmonth)/12);
+
+ document.forms[2].totalfees.value=totalfeesclick;
+ }
+
+
+
function setface(val){
if (val==2){
- document.forms[2][32].disabled=true
- document.forms[2][32].checked=false
- document.forms[2][31].checked=true
+ document.forms[2][34].disabled=true
+ document.forms[2][34].checked=false
+ document.forms[2][33].checked=true
}else{
- document.forms[2][32].disabled=false
+ document.forms[2][34].disabled=false
}
}
@@ -506,15 +530,10 @@
paneldimension="3 X 2-20M100P4";
}
- document.forms[2][33].value=selectedvalue;
- // document.forms[2][34].value=1;
- //document.forms[2][32].value="5 X 4-50M500P2";
+ document.forms[2][36].value=selectedvalue;
+ document.forms[2][36].disabled=true;
- //alert (document.forms[2][32].value);
- //location.href="?PHPSESSID='.session_id().'&routename="+val;
-
-
}
//checkvalue(1);
_hs_swapOptions(document.forms[2],"paneltypedimension",0);
@@ -651,7 +670,70 @@
"javascript:setface(this.options[this.selectedIndex].value);");
$this->fb_preDefElements['medianwidth'] = HTML_QuickForm::createElement(
'select', 'medianwidth', _('Median available'),$arryesno,$attrs);
+ $this->fb_preDefElements['image'] = HTML_QuickForm::createElement(
+ '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'));
+ $this->fb_preDefElements['annualfees']=HTML_QuickForm::createElement(
+ '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'),$attrs);
+
+ }else{
+ $this->fb_preDefElements['panelarea']=HTML_QuickForm::createElement(
+ 'text', 'panelarea', _('Panel Area'),array("readonly=true"));
+ $this->fb_preDefElements['usefees']=HTML_QuickForm::createElement(
+ 'text', 'usefees', _('Use fees'),array("readonly=true"));
+ $this->fb_preDefElements['annualfees']=HTML_QuickForm::createElement(
+ 'text', 'annualfees', _('Annualfees'),array("readonly=true"));
+ $this->fb_preDefElements['totalfees']=HTML_QuickForm::createElement(
+ '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'),$attrs);
+
+ }
+
+ $this->fb_preDefElements['registerno'] = HTML_QuickForm::createElement(
+ 'text', 'registerno', _('Registeration No.:'),array('onclick' =>
+ "javascript:xajax_myFunction(this.value);",'onfocus' =>
+ "javascript:xajax_myFunction(this.value);",'onblur' =>
+ "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)
@@ -668,6 +750,9 @@
$this->routetype=$_POST['paneltypedimension'][0];
$this->paneltype=$_POST['paneltypedimension'][1];
+
+
+
}
/**
* Return an HTML_Table containing all available translations. The table
Modified: trunk/rapc/include/dataobject/rapc.ini
===================================================================
--- trunk/rapc/include/dataobject/rapc.ini 2006-11-14 06:04:01 UTC (rev 10)
+++ trunk/rapc/include/dataobject/rapc.ini 2006-11-14 07:29:50 UTC (rev 11)
@@ -78,7 +78,10 @@
username = 2
insertdate = 6
permitno=2
-permitdate=6
+image=2
+registerno=2
+boolrow=130
+
[public.panel__keys]
id=K
[public.translation]
Modified: trunk/rapc/include/dataobject/rapc.links.ini
===================================================================
--- trunk/rapc/include/dataobject/rapc.links.ini 2006-11-14 06:04:01 UTC (rev 10)
+++ trunk/rapc/include/dataobject/rapc.links.ini 2006-11-14 07:29:50 UTC (rev 11)
@@ -7,10 +7,10 @@
lightavailable=public.yesno:codedvalue
medianwidth=public.yesno:codedvalue
ownership=public.ownership:codedvalue
+boolrow=public.yesno:codedvalue
-
[public.routedirection]
codedvalue=public.routedirection:codedvalue
Modified: trunk/rapc/script/create_rapc_ddl.sql
===================================================================
--- trunk/rapc/script/create_rapc_ddl.sql 2006-11-14 06:04:01 UTC (rev 10)
+++ trunk/rapc/script/create_rapc_ddl.sql 2006-11-14 07:29:50 UTC (rev 11)
@@ -156,9 +156,9 @@
username varchar(32),
insertdate date,
permitno varchar(10),
- permitdate date,
image varchar(128),
- registerno varchar(16)
+ registerno varchar(16),
+ boolrow integer
);
create table ownership(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-11-14 07:29:55
|
Revision: 11
http://svn.sourceforge.net/rapc/?rev=11&view=rev
Author: maher_karim
Date: 2006-11-13 23:29:50 -0800 (Mon, 13 Nov 2006)
Log Message:
-----------
2006-11-14 Maher Abdel karim <mah...@do...>
* script/create_rapc_ddl.sql: add boolrow to panel table.remove permitdate
* include/dataobject/rapc.ini:
* include/dataobject/rapc.links.ini:added boolrow to panel table.
* include/dataobject/public_panel.php:add boolrow, and related functions
Modified Paths:
--------------
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/dataobject/rapc.ini
trunk/rapc/include/dataobject/rapc.links.ini
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...> - 2006-11-29 13:12:32
|
Revision: 16
http://svn.sourceforge.net/rapc/?rev=16&view=rev
Author: maher_karim
Date: 2006-11-29 05:12:27 -0800 (Wed, 29 Nov 2006)
Log Message:
-----------
2006-11-22 Maher Abdel karim <mah...@do...>
* include/dataobject/public_panel.php:add boolrow, and related functions
* include/i18n.php:more translations
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/i18n.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-11-29 13:12:41
|
Revision: 16
http://svn.sourceforge.net/rapc/?rev=16&view=rev
Author: maher_karim
Date: 2006-11-29 05:12:27 -0800 (Wed, 29 Nov 2006)
Log Message:
-----------
2006-11-22 Maher Abdel karim <mah...@do...>
* include/dataobject/public_panel.php:add boolrow, and related functions
* include/i18n.php:more translations
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/i18n.php
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2006-11-25 07:22:29 UTC (rev 15)
+++ trunk/rapc/changelog 2006-11-29 13:12:27 UTC (rev 16)
@@ -1,16 +1,15 @@
-2006-11-21 Steffen Macke <Steffen Ma...@do...>
+2006-11-22 Maher Abdel karim <mah...@do...>
- * doc/build.xml: Removed code that was commented out; use lowercase
- file names
- * doc/user/en/rapc_user_guide.xml:
- * doc/administration/rapc_administration_guide.xml: Use rapc-info
- mailing list
- * locale/en/LC_MESSAGES/rapc.po: Updated English translations; use
- relative path to sources
- * doc/administration/figure/rapc_license.png: Added missing file
- * doc/administration/images/warning.png: Added missing file
- * panelpage.php: Improved copyright comment
+ * include/dataobject/public_panel.php:add boolrow, and related functions
+ * include/i18n.php:more translations
+
+2006-11-14 Maher Abdel karim <mah...@do...>
+ * script/create_rapc_ddl.sql: add boolrow to panel table.remove permitdate
+ * include/dataobject/rapc.ini:
+ * include/dataobject/rapc.links.ini:added boolrow to panel table.
+ * include/dataobject/public_panel.php:add boolrow, and related functions
+
2006-11-13 Maher Abdel karim <mah...@do...>
* conf/dccssconfig.php.default:
Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php 2006-11-25 07:22:29 UTC (rev 15)
+++ trunk/rapc/include/dataobject/Public_panel.php 2006-11-29 13:12:27 UTC (rev 16)
@@ -143,13 +143,8 @@
$form->addRule('receiptdate', _('Please Enter the receipt date for the panel.'),
'required', null, $_SESSION["strHtmlQuickFormValidation"]);
- $form->addRule('insurancereceiptno',
- _('Please Enter the insurance receipt no for the panel.'),
- 'required', null, $_SESSION["strHtmlQuickFormValidation"]);
- $form->addRule('insurancereceiptdate',
- _('Please Enter the insurance 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.'),
@@ -229,8 +224,7 @@
'nonzero',null,'client');
$form->addRule('panelarea', _('Please select the panel dimension, the value should not be zero'),
'nonzero',null,'client');
- $form->addRule('usefees', _('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');
@@ -406,6 +400,7 @@
document.forms[2].mobileno.disabled=true
document.forms[2].pobox.disabled=true
document.forms[2].contractno.disabled=true
+
}
@@ -538,6 +533,7 @@
//checkvalue(1);
_hs_swapOptions(document.forms[2],"paneltypedimension",0);
getcost(1);
+
}
//-->
</script>';
@@ -689,7 +685,7 @@
"javascript:getcost(0);");
$this->fb_preDefElements['date']=HTML_QuickForm::createElement(
- 'date', 'date', _('Date'),array('minYear'=>'1975'),$attrs);
+ 'date', 'date', _('Date'),array('minYear'=>'1975','format'=>'dmY'),$attrs);
}else{
@@ -707,7 +703,7 @@
"javascript:getcost(0);");
$this->fb_preDefElements['date']=HTML_QuickForm::createElement(
- 'date', 'date', _('Date'),array('minYear'=>'2001'),$attrs);
+ 'date', 'date', _('Date'),array('minYear'=>'2001','format'=>'dmY'),$attrs);
}
Modified: trunk/rapc/include/i18n.php
===================================================================
--- trunk/rapc/include/i18n.php 2006-11-25 07:22:29 UTC (rev 15)
+++ trunk/rapc/include/i18n.php 2006-11-29 13:12:27 UTC (rev 16)
@@ -76,6 +76,7 @@
_("Tafilah");
_("Zarqa");
_("Companyname");
+_("Jan");
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2006-11-29 18:14:36
|
Revision: 17
http://svn.sourceforge.net/rapc/?rev=17&view=rev
Author: sdteffen
Date: 2006-11-29 10:14:25 -0800 (Wed, 29 Nov 2006)
Log Message:
-----------
* changelog: Restored deleted 2006-11-29 ChangeLog entry
Ignoring some files and folders.
Modified Paths:
--------------
trunk/rapc/changelog
Property Changed:
----------------
trunk/rapc/dtd/
trunk/rapc/lib/
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2006-11-29 13:12:27 UTC (rev 16)
+++ trunk/rapc/changelog 2006-11-29 18:14:25 UTC (rev 17)
@@ -1,3 +1,7 @@
+2006-11-29 Steffen Macke <Ste...@do...>
+
+ * changelog: Restored deleted 2006-11-29 ChangeLog entry
+
2006-11-22 Maher Abdel karim <mah...@do...>
* include/dataobject/public_panel.php:add boolrow, and related functions
@@ -2,2 +6,15 @@
* include/i18n.php:more translations
+
+2006-11-21 Steffen Macke <Steffen Ma...@do...>
+
+ * doc/build.xml: Removed code that was commented out; use lowercase
+ file names
+ * doc/user/en/rapc_user_guide.xml:
+ * doc/administration/rapc_administration_guide.xml: Use rapc-info
+ mailing list
+ * locale/en/LC_MESSAGES/rapc.po: Updated English translations; use
+ relative path to sources
+ * doc/administration/figure/rapc_license.png: Added missing file
+ * doc/administration/images/warning.png: Added missing file
+ * panelpage.php: Improved copyright comment
Property changes on: trunk/rapc/dtd
___________________________________________________________________
Name: svn:ignore
+ ent
Property changes on: trunk/rapc/lib
___________________________________________________________________
Name: svn:ignore
+ *.jar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdt...@us...> - 2006-11-29 18:14:37
|
Revision: 17
http://svn.sourceforge.net/rapc/?rev=17&view=rev
Author: sdteffen
Date: 2006-11-29 10:14:25 -0800 (Wed, 29 Nov 2006)
Log Message:
-----------
* changelog: Restored deleted 2006-11-29 ChangeLog entry
Ignoring some files and folders.
Modified Paths:
--------------
trunk/rapc/changelog
Property Changed:
----------------
trunk/rapc/dtd/
trunk/rapc/lib/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-12-13 05:42:53
|
Revision: 18
http://svn.sourceforge.net/rapc/?rev=18&view=rev
Author: maher_karim
Date: 2006-12-12 21:42:51 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
2006-12-13 Maher Abdel karim <mah...@do...>
* reports.php:add link to authorized panel installation.
* query.php: fix query.
* include/i81n.php:add translations.
* include/dataobject/public_panel.php:add more validation.add assign values
for routetype value to have it from the hidden value to solve the disabled
item value.
* authorized_panel_report.php:add authorized panel installation report.
* panelpage.php:Add new hidden value for routetype to handle the disabled
element value.
* include/dccsspage.php:
* include/header.php:
* rapc.nsi:adjust version number to be 0.5.0.
* panelinstallation_report.php:adjust query.
* script/create_views.sql:add new panelinformation view.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/conf/rapc_ar.map
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/dccsspage.php
trunk/rapc/include/header.php
trunk/rapc/include/i18n.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
trunk/rapc/query.php
trunk/rapc/rapc.nsi
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...> - 2006-12-18 07:34:42
|
Revision: 31
http://svn.sourceforge.net/rapc/?rev=31&view=rev
Author: maher_karim
Date: 2006-12-17 23:34:32 -0800 (Sun, 17 Dec 2006)
Log Message:
-----------
2006-12-14 Maher Abdel karim <mah...@do...>
* script/create_views.sql:fix error.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/script/create_views.sql
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2006-12-14 11:57:23 UTC (rev 30)
+++ trunk/rapc/changelog 2006-12-18 07:34:32 UTC (rev 31)
@@ -1,3 +1,8 @@
+2006-12-14 Maher Abdel karim <mah...@do...>
+
+ * script/create_views.sql:fix error.
+ * doc/user/en/images/*.png: add more images.
+
2006-12-13 Maher Abdel karim <mah...@do...>
* reports.php:add link to authorized panel installation.
Modified: trunk/rapc/script/create_views.sql
===================================================================
--- trunk/rapc/script/create_views.sql 2006-12-14 11:57:23 UTC (rev 30)
+++ trunk/rapc/script/create_views.sql 2006-12-18 07:34:32 UTC (rev 31)
@@ -39,7 +39,7 @@
left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension)
left outer join routetype on (routetype.codedvalue=panel.routetype) left outer
join facecount on (facecount.codedvalue=panel.facecount) left outer join yesno on
-(panel.boolrow=yesno.codedvalue)
+(panel.boolrow=yesno.codedvalue);
grant select on panelinformation to public;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mah...@us...> - 2006-12-18 07:34:42
|
Revision: 31
http://svn.sourceforge.net/rapc/?rev=31&view=rev
Author: maher_karim
Date: 2006-12-17 23:34:32 -0800 (Sun, 17 Dec 2006)
Log Message:
-----------
2006-12-14 Maher Abdel karim <mah...@do...>
* script/create_views.sql:fix error.
Modified Paths:
--------------
trunk/rapc/changelog
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-01-10 13:08:44
|
Revision: 32
http://svn.sourceforge.net/rapc/?rev=32&view=rev
Author: maher_karim
Date: 2007-01-10 05:08:39 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
2007-01-10 Maher Abdel karim <mah...@do...>
* script/create_rapc_ddl.sql: Add more fields to store verification, and
contract information.
* include/dataobject/rapc.ini:adjust the panel table fields.
* include/dataobject/public_rapc.php:Add the new fields to the page.
* script/create_views.sql:adjust the view to contain the variation info.
* illegal_panelinstallation_report.php:adjust report.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/dataobject/rapc.ini
trunk/rapc/panelpage.php
trunk/rapc/script/create_rapc_ddl.sql
trunk/rapc/script/create_views.sql
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2006-12-18 07:34:32 UTC (rev 31)
+++ trunk/rapc/changelog 2007-01-10 13:08:39 UTC (rev 32)
@@ -1,3 +1,12 @@
+2007-01-10 Maher Abdel karim <mah...@do...>
+
+ * script/create_rapc_ddl.sql: Add more fields to store verification, and
+ contract information.
+ * include/dataobject/rapc.ini:adjust the panel table fields.
+ * include/dataobject/public_rapc.php:Add the new fields to the page.
+ * script/create_views.sql:adjust the view to contain the variation info.
+ * illegal_panelinstallation_report.php:adjust report.
+
2006-12-14 Maher Abdel karim <mah...@do...>
* script/create_views.sql:fix error.
Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php 2006-12-18 07:34:32 UTC (rev 31)
+++ trunk/rapc/include/dataobject/Public_panel.php 2007-01-10 13:08:39 UTC (rev 32)
@@ -61,6 +61,10 @@
var $image;
var $regiterno;
var $boolrow;
+ var $contractunitprice;
+ var $verificationreceiptno;
+ var $verificationreceiptdate;
+ var $verificationamount;
/* ZE2 compatibility trick*/
function __clone() { return $this;}
@@ -92,7 +96,8 @@
'lightavailable','facecount','paneltypedimension',
'panelarea','annualfees','usefees','totalfees','agreedby','receiptno',
'receiptdate','insurancereceiptno','insurancereceiptdate',
- 'contractno','notes','idroadiddistrict','permitno','image','boolrow');
+ 'contractno','notes','idroadiddistrict','permitno','contractunitprice',
+ 'verificationreceiptno','verificationreceiptdate','verificationamount','image','boolrow');
var $fb_preDefOrder = array( 'companyname','panelcatagory', 'ownership',
'registerno',
@@ -105,7 +110,8 @@
'lightavailable','facecount','boolrow','paneltypedimension',
'panelarea','annualfees','usefees','totalfees','agreedby','permitno','receiptno',
'receiptdate','insurancereceiptno','insurancereceiptdate',
- 'contractno','notes','image','idroadiddistrict');
+ 'verificationreceiptno','verificationreceiptdate','verificationamount',
+ 'contractno','contractunitprice','notes','image','idroadiddistrict');
var $fb_linkElementTypes = array('facecount' => 'radio');
var $fb_enumFields = array('facecount');
@@ -296,6 +302,7 @@
$this->x=$this->x;
$this->y=$this->y;
//$this->image='test';
+ unset ($_SESSION['routetypevalue']);
}
return parent::update($do);
@@ -310,7 +317,7 @@
$this->x=$this->x;
$this->y=$this->y;
// $this->image='test';
-
+ unset ($_SESSION['routetypevalue']);
}
@@ -351,7 +358,11 @@
'insurancereceiptno'=>_('Insurance Receipt No.:'),
'insurancereceiptdate'=>_('Insurance Receipt Date:'),'contractno'=>_('Contract No:'),
'notes'=>_('Notes:'),'permitno'=>_('Permission No.:'),
- 'registerno'=>_('Registeration No.:'),'boolrow'=>_('Right of Way'));
+ 'registerno'=>_('Registeration No.:'),'boolrow'=>_('Right of Way'),
+ 'contractunitprice'=>_("Contract Unit Price"),
+ 'verificationreceiptno'=>_("Verification Receipt No"),
+ 'verificationreceiptdate'=>_("Verification Receipt Date"),
+ 'verificationamount'=>_("Verification Amount"));
$this->fb_formHeaderText= _('Advertisement Panel Information Data Entry');
@@ -375,6 +386,7 @@
function setitems(val){
if (val==1){
document.forms[2].contractno.disabled=false
+ document.forms[2].contractunitprice.disabled=false
}
if (val==3){
document.forms[2].companyname.disabled=false
@@ -388,7 +400,7 @@
document.forms[2].mobileno.disabled=false
document.forms[2].pobox.disabled=false
document.forms[2].contractno.disabled=true
-
+ document.forms[2].contractunitprice.disabled=true
}
if (val==2){
document.forms[2].companyname.disabled=true
@@ -402,7 +414,7 @@
document.forms[2].mobileno.disabled=true
document.forms[2].pobox.disabled=true
document.forms[2].contractno.disabled=true
-
+ document.forms[2].contractunitprice.disabled=true
}
@@ -448,9 +460,14 @@
//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);
- document.forms[2].totalfees.value=parseInt(totalfees);
+
var applicationtype='; print_r("'".$_REQUEST['type']."'");
echo ';
@@ -482,9 +499,11 @@
var usefees2=parseInt(document.forms[2].usefees.value);
var startmonth=document.forms[2][22].value;
- var totalfeesclick = (((panelarea2*annualfees2)*facecount)+usefees2)*((13-startmonth)/12);
-
- document.forms[2].totalfees.value=totalfeesclick;
+ if ((document.forms[2].annualfees.value!=0)){
+ var totalfeesclick = (((panelarea2*annualfees2)*facecount)+usefees2)*((13-startmonth)/12);
+ document.forms[2].totalfees.value=totalfeesclick;
+
+ }
}
@@ -531,7 +550,7 @@
document.forms[2][36].disabled=true;
document.forms[2].routetypevalue.value=selectedvalue;
-
+ //alert (selectedvalue);
}
//checkvalue(1);
_hs_swapOptions(document.forms[2],"paneltypedimension",0);
Modified: trunk/rapc/include/dataobject/rapc.ini
===================================================================
--- trunk/rapc/include/dataobject/rapc.ini 2006-12-18 07:34:32 UTC (rev 31)
+++ trunk/rapc/include/dataobject/rapc.ini 2007-01-10 13:08:39 UTC (rev 32)
@@ -81,6 +81,10 @@
image=2
registerno=2
boolrow=130
+contractunitprice=1
+verificationreceiptno=2
+verificationreceiptdate=6
+verificationamount=1
[public.panel__keys]
id=K
Modified: trunk/rapc/panelpage.php
===================================================================
--- trunk/rapc/panelpage.php 2006-12-18 07:34:32 UTC (rev 31)
+++ trunk/rapc/panelpage.php 2007-01-10 13:08:39 UTC (rev 32)
@@ -174,7 +174,8 @@
$objPanel->routetype,$objPanel->paneltype,$objPanel->paneldimension)));
$objPanelForm->setDefaults(array('road_route_district' => array($objPanel->district,
$objPanel->roadname,$objPanel->routename)));
-
+ $_SESSION['routetypevalue']=$objPanel->routetype;
+
}
function move_file($data) {
@@ -246,7 +247,8 @@
'lightavailable',
'panelarea','annualfees','usefees','totalfees','agreedby','receiptno',
'insurancereceiptno',
- 'contractno','notes','permitno','registerno');
+ 'contractno','notes','permitno','registerno','contractunitprice',
+ 'verificationreceiptno','verificationreceiptdate','verificationamount');
foreach ($arrResetValues as $arrValue) {
$objPanel1 =& $objPanelForm->getElement($arrValue);
@@ -267,18 +269,20 @@
$objPanelForm->insertElementBefore($objStatic, 'routedirection');
$objStatic =& new HTML_QuickForm_static();
-$objStatic->setText('<input type=hidden name=routetypevalue>');
+$objStatic->setText('<input type=hidden name="routetypevalue" value='.
+$_SESSION['routetypevalue'].'>');
$objPanelForm->insertElementBefore($objStatic, 'image');
+
$objStatic =& new HTML_QuickForm_static();
$objStatic->setText('</td></tr></table>');
$objPanelForm->addElement($objStatic);
-
+
//print_r($_POST);
$strHtml = $objPanelForm->toHTML();
$dccssPage->add($strHtml);
-
+//$objPanelForm->setDefaults(array('routetypevalue' => 'maher'));
//print_r($_POST['paneltypedimension'][2]."Maher");
echo($dccssPage->toHtml());
//print_r($_POST);
Modified: trunk/rapc/script/create_rapc_ddl.sql
===================================================================
--- trunk/rapc/script/create_rapc_ddl.sql 2006-12-18 07:34:32 UTC (rev 31)
+++ trunk/rapc/script/create_rapc_ddl.sql 2007-01-10 13:08:39 UTC (rev 32)
@@ -149,7 +149,7 @@
receiptdate date,
insurancereceiptno varchar(10),
insurancereceiptdate date,
- contractno varchar(10),
+ contractno varchar(20),
panelcatagory integer references panelcatagory(codedvalue), --codedvalue
notes varchar(128),
ownership integer,
@@ -158,7 +158,11 @@
permitno varchar(10),
image varchar(128),
registerno varchar(16),
- boolrow integer
+ boolrow integer,
+ contractunitprice float,
+ verificationreceiptno varchar(10),
+ verificationreceiptdate date,
+ verificationamount float
);
create table ownership(
Modified: trunk/rapc/script/create_views.sql
===================================================================
--- trunk/rapc/script/create_views.sql 2006-12-18 07:34:32 UTC (rev 31)
+++ trunk/rapc/script/create_views.sql 2007-01-10 13:08:39 UTC (rev 32)
@@ -31,7 +31,8 @@
panel.totalfees,panel.usefees,
panel.receiptno,panel.receiptdate,panel.insurancereceiptno,
-panel.insurancereceiptdate,panel.notes
+panel.insurancereceiptdate,panel.notes,panel.verificationreceiptno,
+ panel.verificationreceiptdate
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-01-10 13:08:48
|
Revision: 32
http://svn.sourceforge.net/rapc/?rev=32&view=rev
Author: maher_karim
Date: 2007-01-10 05:08:39 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
2007-01-10 Maher Abdel karim <mah...@do...>
* script/create_rapc_ddl.sql: Add more fields to store verification, and
contract information.
* include/dataobject/rapc.ini:adjust the panel table fields.
* include/dataobject/public_rapc.php:Add the new fields to the page.
* script/create_views.sql:adjust the view to contain the variation info.
* illegal_panelinstallation_report.php:adjust report.
Modified Paths:
--------------
trunk/rapc/changelog
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/dataobject/rapc.ini
trunk/rapc/panelpage.php
trunk/rapc/script/create_rapc_ddl.sql
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-01-11 11:51:16
|
Revision: 33
http://svn.sourceforge.net/rapc/?rev=33&view=rev
Author: maher_karim
Date: 2007-01-11 03:51:13 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
2007-01-11 Maher Abdel karim <mah...@do...>
* script/create_views.sql:adjust the view to contain the variation info.
* authorized_panel_report.php:Added report.
* reports.php:add more links.
* contract_panel_report.php:
* illegal_panelinstallation_report.php:
* panelinstallation_report.php:Added reports.
* include/i18n.php:
* ar/LC_MESSAGES/rapc.po:adjust translations.
Modified Paths:
--------------
trunk/rapc/changelog
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
Added Paths:
-----------
trunk/rapc/authorized_panel_report.php
trunk/rapc/contract_panel_report.php
trunk/rapc/illegal_panelinstallation_report.php
Added: trunk/rapc/authorized_panel_report.php
===================================================================
--- trunk/rapc/authorized_panel_report.php (rev 0)
+++ trunk/rapc/authorized_panel_report.php 2007-01-11 11:51:13 UTC (rev 33)
@@ -0,0 +1,258 @@
+<?php
+/* rapc -- DC Road Advertisement Panel Control
+ *
+ * authorized_panel_report.php - Authorized Panel installation report.
+ *
+ * Copyright (C) 2006 DORSCH Consult
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+require_once("include/dccsspage.php");
+require_once("include/dcmmspear.php");
+//This require for database connection
+require_once("include/dcmpostgis.php");
+// This require for quick form building.
+require_once("HTML/QuickForm.php");
+
+$DccssPage = new RolPage(_("Panel installation report"));
+//print_r($_POST);
+
+$Queryform = new HTML_QuickForm('printForm');
+//print_r($_POST);
+//$Queryform->setDefaults(array('regdate' => array('d'=>date("d"),'M'=>date("m"),'Y'=>date("Y"))));
+$Queryform->setDefaults(array('todate' => array('d'=>date("d"),'M'=>date("m"),'Y'=>date("Y"))));
+// 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")
+or die("Could not connect to Oracle");
+
+$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
+$select1 = array();
+$select1[0] = _('[Select One]');
+foreach ($result->data as $row) {
+
+//foreach ($row as $field) {
+$district=$row[0];
+$select1[$district]=$district;
+//}
+
+}
+$Queryform->addElement('select','district',_('District'),$select1);
+$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>date("Y"),
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>date("Y"),
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('submit', null, _('Search The Database'));
+
+$DccssPage->add($Queryform->tohtml());
+$strWhere ='';
+//print_r($_POST['district']);
+if (($_POST['district']!='') && ($_POST['district']!='0')){
+ $strWhere = $strWhere."where panel.district='".$Queryform->exportvalue('district')."'";
+
+} else {
+ $strWhere = $strWhere."where panel.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 district,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
+,count(routetype) as total,sum(panelarea) as TotalArea,
+sum(totalfees) as totalfees from Panel ".$strWhere." group by panel.district";
+
+//print_r($strQuery);
+
+ $objTable = new DbTable($DccssPage->postgis->db, $strQuery);
+ $objTable->addRows();
+ $numRowCount = $objTable->getRowCount();
+ $DccssPage->add('<B>'._('Ministry of Public Works and Housing').'<br>');
+ $DccssPage->add('<B>'._('Authorized panel list from:')." ".
+$_POST['fromdate']['d']."-".
+ $_POST['fromdate']['M']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
+ $_POST['todate']['M']."-".$_POST['todate']['Y'].'<br>'._('District:').
+ $_POST['district'].'</B>');
+
+$strQuery="select district,count(*),sum(totalfees) from panel ".$strWhere."group by district";
+$objResult = pg_query($strQuery);
+ $numRows = pg_num_rows($objResult);
+ for ($i=0;$i<$numRows;$i++){
+ $Row =pg_fetch_row($objResult,$i);
+ $arrName[$i] = array($Row[0],$Row[2]);
+ $arrDel[$i] = array($Row[0],$Row[1]);
+ $arrSub[$i] =$Row[2];
+ }
+// print_r($strQuery);
+$DccssPage->add($objTable->toHtml());
+
+require_once 'Image/Graph.php';
+
+// create the graph
+$Graph =& Image_Graph::factory('graph', array(900, 800));
+
+// add a TrueType font
+//$Arial_v =& $Graph->addNew("Image_Graph_Font_TTF", "c:\\windows\\fonts\\ARIAL.TTF");
+//$Arial_v->setAngle(90);
+// set the font size to 11 pixels
+//$Font->setSize(10);
+
+//$Graph->setFont($Arial_v);
+$Matrix =& $Graph->addNew('Image_Graph_Layout_Matrix', array(2, 2));
+// setup the plotarea, legend and their layout
+$Graph->add(
+ Image_Graph::vertical(
+ Image_Graph::factory('title', array('Installed Advertisement Panels per Governorate', 12)),
+ Image_Graph::vertical(
+ $Plotarea = Image_Graph::factory('plotarea'),
+ $Legend = Image_Graph::factory('legend'),
+ 88
+ ),
+ 5
+ )
+);
+
+// link the legend with the plotares
+$Legend->setPlotarea($Plotarea);
+
+// create a random dataset for sake of simplicity
+$DatasetDel =& Image_Graph::factory('dataset');
+$DatasetTotal=& Image_Graph::factory('dataset');
+for ($i=0;$i<count($arrName);$i++){
+ $DatasetDel->addpoint($arrName[$i][0],$arrName[$i][1]);
+}
+for ($i=0;$i<count($arrDel);$i++){
+ $DatasetTotal->addpoint($arrDel[$i][0],$arrDel[$i][1]);
+}
+
+$datasets = array($DatasetDel,$DatasetTotal);
+$datasets[0]->setName(_('Total amount'));
+$datasets[1]->setName(_('Panel count'));
+
+// create the plot as line chart using the dataset
+$Plot =& $Plotarea->addNew('bar', array($datasets[0]));
+$Plot->setLineColor('gray');
+
+$FillArray =& Image_Graph::factory('Image_Graph_Fill_Array');
+$FillArray->addColor('blue@0.2');
+$FillArray->addColor('yellow@0.2');
+$Plot->setFillStyle($FillArray);
+
+// create a Y data value marker
+$Marker =& $Plot->addNew('Image_Graph_Marker_Value', IMAGE_GRAPH_VALUE_Y);
+// create a pin-point marker type
+$PointingMarker =& $Plot->addNew('Image_Graph_Marker_Pointing_Angular', array(50, &$Marker));
+// and use the marker on the 1st plot
+$Plot->setMarker($PointingMarker);
+
+$Plot2 =& $Plotarea->addNew('line', array($datasets[1]),IMAGE_GRAPH_AXIS_Y_SECONDARY);
+$Plot2->setLineColor('green');
+
+
+$AxisXSec =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
+$AxisXSec->setFontAngle('vertical');
+
+
+$AxisYsec =& $Plotarea->getAxis(IMAGE_GRAPH_Y_SECONDARY);
+$Marker =& $Graph->addNew('value_marker',IMAGE_GRAPH_VALUE_Y_SECONDARY);
+$Plot2->setMarker($Marker);
+
+$dataset=& $Plotarea->dataset;
+
+// output the Graph
+ $strTmpPath = tempnam("c:\\tmp\\ms_tmp", "graph").".png";
+$Graph->done(array('filename' => $strTmpPath));
+$DccssPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />");;
+
+$strQuery="Select count(*),sum(totalfees) from panel";
+$objResult = pg_query($strQuery);
+ $numRows = pg_num_rows($objResult);
+
+
+ for ($i=0;$i<$numRows;$i++){
+ $Row =pg_fetch_row($objResult,$i);
+
+ $arrName2[$i] = array($Row[0],$Row[1]);
+
+ }
+$Graph =& Image_Graph::factory('graph', array(900, 800));
+
+$Matrix =& $Graph->addNew('Image_Graph_Layout_Matrix', array(2, 2));
+// setup the plotarea, legend and their layout
+$Graph->add(
+ Image_Graph::vertical(
+ Image_Graph::factory('title', array('Total installed Advertisement Panels in the kingdome', 12)),
+ Image_Graph::vertical(
+ $Plotarea = Image_Graph::factory('plotarea'),
+ $Legend = Image_Graph::factory('legend'),
+ 88
+ ),
+ 5
+ )
+);
+
+// link the legend with the plotares
+$Legend->setPlotarea($Plotarea);
+
+// create a random dataset for sake of simplicity
+$DatasetDel2 =& Image_Graph::factory('dataset');
+
+for ($i=0;$i<count($arrName2);$i++){
+ $DatasetDel2->addpoint($arrName2[$i][0],$arrName2[$i][1]);
+}
+
+$datasets = array($DatasetDel2);
+$datasets[0]->setName(_('Total amount'));
+
+
+// create the plot as line chart using the dataset
+$Plot =& $Plotarea->addNew('bar', array($datasets[0]));
+$Plot->setLineColor('red');
+
+$FillArray =& Image_Graph::factory('Image_Graph_Fill_Array');
+$FillArray->addColor('silver@0.2');
+
+$Plot->setFillStyle($FillArray);
+
+// create a Y data value marker
+$Marker =& $Plot->addNew('Image_Graph_Marker_Value', IMAGE_GRAPH_VALUE_Y);
+// create a pin-point marker type
+$PointingMarker =& $Plot->addNew('Image_Graph_Marker_Pointing_Angular', array(20, &$Marker));
+// and use the marker on the 1st plot
+$Plot->setMarker($PointingMarker);
+
+
+
+$dataset=& $Plotarea->dataset;
+
+// output the Graph
+ $strTmpPath = tempnam("c:\\tmp\\ms_tmp", "graph").".png";
+$Graph->done(array('filename' => $strTmpPath));
+$DccssPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />");;
+
+echo $DccssPage->toHTML();
+?>
\ No newline at end of file
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-01-10 13:08:39 UTC (rev 32)
+++ trunk/rapc/changelog 2007-01-11 11:51:13 UTC (rev 33)
@@ -1,3 +1,14 @@
+2007-01-11 Maher Abdel karim <mah...@do...>
+
+ * script/create_views.sql:adjust the view to contain the variation info.
+ * authorized_panel_report.php:Added report.
+ * reports.php:add more links.
+ * contract_panel_report.php:
+ * illegal_panelinstallation_report.php:
+ * panelinstallation_report.php:Added reports.
+ * include/i18n.php:
+ * ar/LC_MESSAGES/rapc.po:adjust translations.
+
2007-01-10 Maher Abdel karim <mah...@do...>
* script/create_rapc_ddl.sql: Add more fields to store verification, and
Added: trunk/rapc/contract_panel_report.php
===================================================================
--- trunk/rapc/contract_panel_report.php (rev 0)
+++ trunk/rapc/contract_panel_report.php 2007-01-11 11:51:13 UTC (rev 33)
@@ -0,0 +1,108 @@
+<?php
+/* rapc -- DC Road Advertisement Panel Control
+ *
+ * contract_panel_report.php - Authorized Panel installation report.
+ *
+ * Copyright (C) 2006,2007 DC Water and Environment
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+require_once("include/dccsspage.php");
+require_once("include/dcmmspear.php");
+//This require for database connection
+require_once("include/dcmpostgis.php");
+// This require for quick form building.
+require_once("HTML/QuickForm.php");
+
+$DccssPage = new RolPage(_("Contract Panel installation report"));
+//print_r($_POST);
+
+$Queryform = new HTML_QuickForm('printForm');
+//print_r($_POST);
+//$Queryform->setDefaults(array('regdate' => array('d'=>date("d"),'M'=>date("m"),'Y'=>date("Y"))));
+$Queryform->setDefaults(array('todate' => array('d'=>date("d"),'M'=>date("m"),'Y'=>date("Y"))));
+// 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")
+or die("Could not connect to Oracle");
+
+$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
+$select1 = array();
+$select1[0] = _('[Select One]');
+foreach ($result->data as $row) {
+
+//foreach ($row as $field) {
+$district=$row[0];
+$select1[$district]=$district;
+//}
+
+}
+$Queryform->addElement('select','district',_('District'),$select1);
+$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>date("Y"),
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>date("Y"),
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('submit', null, _('Search The Database'));
+
+$DccssPage->add($Queryform->tohtml());
+$strWhere ='';
+//print_r($_POST['district']);
+if ($_POST['district']!=''){
+ $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
+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
+
+from panel left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension) ".$strWhere."
+group by contractno,companyname,registerno,paneldimension.description,facecount";
+
+//print_r($strQuery);
+
+ $objTable = new DbTable($DccssPage->postgis->db, $strQuery);
+ $objTable->addRows();
+ $numRowCount = $objTable->getRowCount();
+ $DccssPage->add('<B>'._('Ministry of Public Works and Housing').'<br>');
+ $DccssPage->add('<B>'._('Authorized panel list by contract for the period from:')." ".
+$_POST['fromdate']['d']."-".
+ $_POST['fromdate']['M']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
+ $_POST['todate']['M']."-".$_POST['todate']['Y'].'<br>'._('District:').
+ $_POST['district'].'</B>');
+$DccssPage->add($objTable->toHtml());
+
+
+echo $DccssPage->toHTML();
+?>
\ No newline at end of file
Added: trunk/rapc/illegal_panelinstallation_report.php
===================================================================
--- trunk/rapc/illegal_panelinstallation_report.php (rev 0)
+++ trunk/rapc/illegal_panelinstallation_report.php 2007-01-11 11:51:13 UTC (rev 33)
@@ -0,0 +1,126 @@
+<?php
+/* rapc -- DC Road Advertisement Panel Control
+ *
+ * illegal_panelinstallation_report.php - Panel installation report.
+ *
+ * Copyright (C) 2006 DORSCH Consult
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+require_once("include/dccsspage.php");
+require_once("include/dcmmspear.php");
+//This require for database connection
+require_once("include/dcmpostgis.php");
+// This require for quick form building.
+require_once("HTML/QuickForm.php");
+
+$DccssPage = new RolPage(_("Illegal Panel installation report"));
+//print_r($_POST);
+
+$Queryform = new HTML_QuickForm('printForm');
+//print_r($_POST);
+//$Queryform->setDefaults(array('regdate' => array('d'=>date("d"),'M'=>date("m"),'Y'=>date("Y"))));
+$Queryform->setDefaults(array('todate' => array('d'=>date("d"),'M'=>date("m"),'Y'=>date("Y"))));
+// 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")
+or die("Could not connect to Oracle");
+
+$result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
+$select1 = array();
+$select1[0] = _('[Select One]');
+foreach ($result->data as $row) {
+
+//foreach ($row as $field) {
+$district=$row[0];
+$select1[$district]=$district;
+//}
+
+}
+$Queryform->addElement('select','district',_('District'),$select1);
+$Queryform->addElement('date', 'fromdate', _('From Date:'),array('maxYear'=>date("Y"),
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('date', 'todate', _('To Date:'),array('maxYear'=>date("Y"),
+'addEmptyOption'=>TRUE,'emptyOptionText'=>_('Select date')));
+$Queryform->addElement('submit', null, _('Search The Database'));
+
+$DccssPage->add($Queryform->tohtml());
+$strWhere ='';
+//print_r($_POST['district']);
+if ($_POST['district']!=''){
+ $strWhere = $strWhere."where panelinformation.district='".
+ $Queryform->exportvalue('district')."' and panelinformation.notes like '%مخالف%' ";
+
+} else {
+ $strWhere = $strWhere."where 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']."-".
+ $_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,
+paneldimension.description as dimension,facecount.description as facecount,
+insurance.description as insurance,
+
+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.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
+join facecount on (facecount.codedvalue=panel.facecount) ".$strWhere;
+
+$strQuery="select companyname,panelsubject,routetype,routename,dimension,boolrow,
+sum(totalfees),facecount,count(*),usefees,insurance,receiptno,recEiptdate,
+insurancereceiptdate
+from panelinformation ".$strWhere."group by companyname,routename,panelsubject,
+routetype,dimension,facecount,insurance,usefees,receiptno,receiptdate,
+insurancereceiptdate,boolrow";
+*/
+$strQuery="select 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";
+//print_r($strQuery);
+
+ $objTable = new DbTable($DccssPage->postgis->db, $strQuery);
+ $objTable->addRows();
+ $numRowCount = $objTable->getRowCount();
+ $DccssPage->add('<B>'._('Illegal panel list from:')." ".
+$_POST['fromdate']['d']."-".
+ $_POST['fromdate']['M']."-".$_POST['fromdate']['Y']._(' To:')." ".$_POST['todate']['d']."-".
+ $_POST['todate']['M']."-".$_POST['todate']['Y'].'<br>'._('District:').
+ $_POST['district'].'</B>');
+$DccssPage->add($objTable->toHtml());
+
+
+echo $DccssPage->toHTML();
+?>
\ No newline at end of file
Modified: trunk/rapc/include/i18n.php
===================================================================
--- trunk/rapc/include/i18n.php 2007-01-10 13:08:39 UTC (rev 32)
+++ trunk/rapc/include/i18n.php 2007-01-11 11:51:13 UTC (rev 33)
@@ -81,6 +81,18 @@
_("Boolrow");
_("Sum");
_("No");
+_("Contractno");
+_("Registerno");
+_("Fees");
+_("Pedding");
+_("Totalpanels");
+_("Pedding");
+_("Panelcount");
+_("Advertisement_period");
+_("Verificationreceiptno");
+_("Verificationreceipdate");
+_("Verificationreceiptdate");
+_("Main");
?>
Modified: trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-01-10 13:08:39 UTC (rev 32)
+++ trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-01-11 11:51:13 UTC (rev 33)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: mpwh\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2006-12-12 13:11+0200\n"
+"PO-Revision-Date: 2007-01-11 13:44+0200\n"
"Last-Translator: t <t>\n"
"Language-Team: dc <mah...@do...>\n"
"MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@
msgstr "رقم القطعة:"
#: ../../../address_confirmation.php:39
-#: ../../../include/dataobject/Public_panel.php:361
+#: ../../../include/dataobject/Public_panel.php:372
msgid "Submit"
msgstr "حفظ"
@@ -124,12 +124,16 @@
msgstr "تقرير تركيب اللوحات"
#: ../../../authorized_panel_report.php:37
+#: ../../../contract_panel_report.php:37
+#: ../../../detailed_panelinstallation_report.php:37
#: ../../../illegal_panelinstallation_report.php:37
#: ../../../panelinstallation_report.php:37
msgid "Panel Installation"
msgstr "تركيب اللوحة"
#: ../../../authorized_panel_report.php:44
+#: ../../../contract_panel_report.php:44
+#: ../../../detailed_panelinstallation_report.php:44
#: ../../../illegal_panelinstallation_report.php:44
#: ../../../panelinstallation_report.php:44
#: ../../../query.php:76
@@ -141,6 +145,8 @@
msgstr "[تحرير]"
#: ../../../authorized_panel_report.php:53
+#: ../../../contract_panel_report.php:53
+#: ../../../detailed_panelinstallation_report.php:53
#: ../../../illegal_panelinstallation_report.php:53
#: ../../../panelinstallation_report.php:53
#: ../../../query.php:52
@@ -148,6 +154,8 @@
msgstr "المحافظة"
#: ../../../authorized_panel_report.php:54
+#: ../../../contract_panel_report.php:54
+#: ../../../detailed_panelinstallation_report.php:54
#: ../../../illegal_panelinstallation_report.php:54
#: ../../../panelinstallation_report.php:54
msgid "From Date:"
@@ -155,6 +163,10 @@
#: ../../../authorized_panel_report.php:55
#: ../../../authorized_panel_report.php:57
+#: ../../../contract_panel_report.php:55
+#: ../../../contract_panel_report.php:57
+#: ../../../detailed_panelinstallation_report.php:55
+#: ../../../detailed_panelinstallation_report.php:57
#: ../../../illegal_panelinstallation_report.php:55
#: ../../../illegal_panelinstallation_report.php:57
#: ../../../panelinstallation_report.php:55
@@ -164,12 +176,16 @@
msgstr "اختر التاريخ"
#: ../../../authorized_panel_report.php:56
+#: ../../../contract_panel_report.php:56
+#: ../../../detailed_panelinstallation_report.php:56
#: ../../../illegal_panelinstallation_report.php:56
#: ../../../panelinstallation_report.php:56
msgid "To Date:"
msgstr "الى تاريخ:"
#: ../../../authorized_panel_report.php:58
+#: ../../../contract_panel_report.php:58
+#: ../../../detailed_panelinstallation_report.php:58
#: ../../../illegal_panelinstallation_report.php:58
#: ../../../panelinstallation_report.php:58
#: ../../../query.php:110
@@ -177,32 +193,59 @@
msgstr "البحث في قاعدة البيانات"
#: ../../../authorized_panel_report.php:94
+#: ../../../contract_panel_report.php:98
#: ../../../print.php:62
msgid "Ministry of Public Works and Housing"
msgstr "وزارة الاشغال العامة و الاسكان"
#: ../../../authorized_panel_report.php:95
+#: ../../../detailed_panelinstallation_report.php:90
#: ../../../panelinstallation_report.php:111
msgid "Authorized panel list from:"
msgstr "قائمة اللوحات المرخصة من:"
#: ../../../authorized_panel_report.php:97
-#: ../../../illegal_panelinstallation_report.php:114
+#: ../../../contract_panel_report.php:101
+#: ../../../detailed_panelinstallation_report.php:92
+#: ../../../illegal_panelinstallation_report.php:119
#: ../../../panelinstallation_report.php:113
msgid " To:"
msgstr "الى:"
#: ../../../authorized_panel_report.php:98
-#: ../../../illegal_panelinstallation_report.php:115
+#: ../../../contract_panel_report.php:102
+#: ../../../detailed_panelinstallation_report.php:93
+#: ../../../illegal_panelinstallation_report.php:120
#: ../../../panelinstallation_report.php:114
msgid "District:"
msgstr "المحافظة:"
+#: ../../../authorized_panel_report.php:153
+#: ../../../authorized_panel_report.php:229
+msgid "Total amount"
+msgstr "المجموع الاجمالي"
+
+#: ../../../authorized_panel_report.php:154
+msgid "Panel count"
+msgstr "عدد اللوحات"
+
+#: ../../../contract_panel_report.php:29
+msgid "Contract Panel installation report"
+msgstr "تقرير تركيب اللوحات - العطاءات"
+
+#: ../../../contract_panel_report.php:99
+msgid "Authorized panel list by contract for the period from:"
+msgstr "قائمة اللوحات المرخصه للع\xD8\xB7اءات للفترة من:"
+
+#: ../../../detailed_panelinstallation_report.php:29
+msgid "Detailed Panel installation report"
+msgstr "تقرير اللوحات الاعلانية المركبة المفصل"
+
#: ../../../illegal_panelinstallation_report.php:29
msgid "Illegal Panel installation report"
msgstr "تقرير اللوحات الاعلانية المخالفة"
-#: ../../../illegal_panelinstallation_report.php:112
+#: ../../../illegal_panelinstallation_report.php:117
msgid "Illegal panel list from:"
msgstr "قائمة اللوحات المخالفة من:"
@@ -235,7 +278,7 @@
msgstr "اضغط على الرابط للمشاهدة على الخريطة"
#: ../../../index.php:58
-#: ../../../panelpage.php:238
+#: ../../../panelpage.php:239
msgid "New Data Entry"
msgstr "ادخال معلومات لوحة جديدة"
@@ -511,7 +554,7 @@
msgstr "رقم اللوحة"
#: ../../../panelpage.php:151
-#: ../../../panelpage.php:236
+#: ../../../panelpage.php:237
msgid "View on Map"
msgstr "اظهار على الخريطة"
@@ -519,15 +562,15 @@
msgid "Please refer to RIS information to complete road information."
msgstr "يرجى الرجوع الى نظام RIS لاستكمال معلومات الطريق و التأكد منها."
-#: ../../../panelpage.php:216
+#: ../../../panelpage.php:217
msgid "Failed to save record(s)."
msgstr "لم يتم حفظ الشجلات."
-#: ../../../panelpage.php:225
+#: ../../../panelpage.php:226
msgid "Image is loaded"
msgstr "تم تحميل الصورة"
-#: ../../../panelpage.php:232
+#: ../../../panelpage.php:233
msgid "Record(s) successfully saved."
msgstr "تمت عملية حفظ السجلات بنجاح."
@@ -613,7 +656,7 @@
#: ../../../query.php:116
#: ../../../admin/setup.php:61
-#: ../../../include/dataobject/Public_panel.php:287
+#: ../../../include/dataobject/Public_panel.php:293
msgid "denotes required field"
msgstr "ادخل معلومات الحقول المطلوبة"
@@ -637,6 +680,14 @@
msgid "Illegal Panel installation"
msgstr "اللوحات الاعلانية المخالفة"
+#: ../../../reports.php:41
+msgid "Detailed Panel installation"
+msgstr "تفصيل اللوحات المركبة المفصل"
+
+#: ../../../reports.php:43
+msgid "Contract Panel installation"
+msgstr "لوحات العطاءات المركبة"
+
#: ../../../admin/setup.php:41
msgid "DCMMS Setup"
msgstr ""
@@ -994,7 +1045,7 @@
#: ../../../admin/user_management.php:306
#: ../../../include/header.php:430
#: ../../../include/i18n.php:24
-#: ../../../include/dataobject/Public_panel.php:777
+#: ../../../include/dataobject/Public_panel.php:796
msgid "Action"
msgstr "الاجراء"
@@ -1195,8 +1246,8 @@
#: ../../../include/i18n.php:25
#: ../../../include/i18n.php:83
-#: ../../../include/dataobject/Public_panel.php:664
-#: ../../../include/dataobject/Public_panel.php:726
+#: ../../../include/dataobject/Public_panel.php:683
+#: ../../../include/dataobject/Public_panel.php:745
msgid "No"
msgstr "لا"
@@ -1205,8 +1256,8 @@
msgstr "غير معروف"
#: ../../../include/i18n.php:27
-#: ../../../include/dataobject/Public_panel.php:664
-#: ../../../include/dataobject/Public_panel.php:726
+#: ../../../include/dataobject/Public_panel.php:683
+#: ../../../include/dataobject/Public_panel.php:745
msgid "Yes"
msgstr "نعم"
@@ -1420,447 +1471,504 @@
msgid "Sum"
msgstr "المبالغ المستحقة"
-#: ../../../include/dataobject/Public_panel.php:138
+#: ../../../include/i18n.php:84
+msgid "Contractno"
+msgstr "رقم العطاء"
+
+#: ../../../include/i18n.php:85
+msgid "Registerno"
+msgstr "رقم التسجيل"
+
+#: ../../../include/i18n.php:86
+msgid "Fees"
+msgstr "الرسوم"
+
+#: ../../../include/i18n.php:87
+#: ../../../include/i18n.php:89
+msgid "Pedding"
+msgstr "قيمة المزاودة"
+
+#: ../../../include/i18n.php:88
+msgid "Totalpanels"
+msgstr "عدد اللوحات"
+
+#: ../../../include/i18n.php:90
+msgid "Panelcount"
+msgstr "عدد اللوحات"
+
+#: ../../../include/i18n.php:91
+msgid "Advertisement_period"
+msgstr "فترة الاعلان"
+
+#: ../../../include/i18n.php:92
+msgid "Verificationreceiptno"
+msgstr "رقم الوصل المالي للتصويب"
+
+#: ../../../include/i18n.php:93
+msgid "Verificationreceipdate"
+msgstr "تاريخ الوصل المالي للتصويب"
+
+#: ../../../include/i18n.php:94
+msgid "Verificationreceiptdate"
+msgstr "تاريخ الوصل المالي للتصويب"
+
+#: ../../../include/dataobject/Public_panel.php:144
msgid "Please Enter the X coordinate for the panel."
msgstr "الرجاء ادخال الاحداثية X للوحة"
-#: ../../../include/dataobject/Public_panel.php:141
+#: ../../../include/dataobject/Public_panel.php:147
msgid "Please Enter the receipt no. for the panel."
msgstr "الرجاء ادخال رقم الوصل المالي."
-#: ../../../include/dataobject/Public_panel.php:143
+#: ../../../include/dataobject/Public_panel.php:149
msgid "Please Enter the receipt date for the panel."
msgstr "الرجا\xD8\xA1 ادخال تاريخ الوصل المالي."
-#: ../../../include/dataobject/Public_panel.php:148
+#: ../../../include/dataobject/Public_panel.php:154
msgid "Please Enter the Y coordinate for the panel."
msgstr "الرجاء ادخال الاحداثية Y للوحة."
-#: ../../../include/dataobject/Public_panel.php:150
+#: ../../../include/dataobject/Public_panel.php:156
msgid "Please Enter the distance from the link start."
msgstr "الرجاء ادخال المسافة من اقرب تقاطع."
-#: ../../../include/dataobject/Public_panel.php:152
+#: ../../../include/dataobject/Public_panel.php:158
msgid "The X coordinate should be numeric."
msgstr "الاحداثية X يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:154
+#: ../../../include/dataobject/Public_panel.php:160
msgid "The Y coordinate should be numeric."
msgstr "الاحداثية Y يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:156
+#: ../../../include/dataobject/Public_panel.php:162
msgid "The distance to nearest panel should be numeric."
msgstr "المسافة من اقرب لوحة يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:158
+#: ../../../include/dataobject/Public_panel.php:164
msgid "The distance to nearest link should be numeric."
msgstr "المسافة من اقرب تقاطع يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:160
+#: ../../../include/dataobject/Public_panel.php:166
msgid "The X coordinate to nearest panel should be numeric."
msgstr "احداثية X لاقرب لوحة يجب ان تكون رقم"
-#: ../../../include/dataobject/Public_panel.php:162
+#: ../../../include/dataobject/Public_panel.php:168
msgid "The Y coordinate to nearest panel should be numeric."
msgstr "الاحداثية Y لاقرب لوحة يجب ان تكون رقم."
-#: ../../../include/dataobject/Public_panel.php:164
+#: ../../../include/dataobject/Public_panel.php:170
msgid "The Carriage width should be numeric."
msgstr "عرض الطريق يحب ان يكون رقم."
-#: ../../../include/dataobject/Public_panel.php:166
+#: ../../../include/dataobject/Public_panel.php:172
msgid "The Shoulder width should be numeric."
msgstr "عرض الكتف يجب ان يكون رقم."
-#: ../../../include/dataobject/Public_panel.php:168
+#: ../../../include/dataobject/Public_panel.php:174
msgid "Please select the panel type and dimension."
msgstr "الرجاء تحديد نوع اللوحة و ابعادها"
-#: ../../../include/dataobject/Public_panel.php:171
+#: ../../../include/dataobject/Public_panel.php:177
msgid "Please select the permission no."
msgstr "الرجاء ادخال رقم الترخيص"
-#: ../../../include/dataobject/Public_panel.php:186
+#: ../../../include/dataobject/Public_panel.php:192
msgid "The image type should be JPG."
msgstr "صيغة الصورة يجب ان تكون JPG"
-#: ../../../include/dataobject/Public_panel.php:190
+#: ../../../include/dataobject/Public_panel.php:196
msgid "The Company name should be only letters."
msgstr "اسم الشركة يجب ان لا يحتوي ارقام"
-#: ../../../include/dataobject/Public_panel.php:192
+#: ../../../include/dataobject/Public_panel.php:198
msgid "The Mother name should be only letters."
msgstr "اسم الام يجب ان لا يحتوي ارقام."
-#: ../../../include/dataobject/Public_panel.php:195
+#: ../../../include/dataobject/Public_panel.php:201
msgid "The National No. should be only numeric."
msgstr "الرقم الوطني يجب ان لا يحتوي حروف."
-#: ../../../include/dataobject/Public_panel.php:197
-#: ../../../include/dataobject/Public_panel.php:199
-#: ../../../include/dataobject/Public_panel.php:201
+#: ../../../include/dataobject/Public_panel.php:203
#: ../../../include/dataobject/Public_panel.php:205
#: ../../../include/dataobject/Public_panel.php:207
-#: ../../../include/dataobject/Public_panel.php:209
#: ../../../include/dataobject/Public_panel.php:211
#: ../../../include/dataobject/Public_panel.php:213
+#: ../../../include/dataobject/Public_panel.php:215
+#: ../../../include/dataobject/Public_panel.php:217
+#: ../../../include/dataobject/Public_panel.php:219
msgid "The entered value should be only numeric."
msgstr "القيمة المدخلة يجب ان تكون ارقام فقط."
-#: ../../../include/dataobject/Public_panel.php:203
+#: ../../../include/dataobject/Public_panel.php:209
msgid "The Entered value should be numeric."
msgstr "القيمة المدخلة يجب ان تكون ارقام فقط."
-#: ../../../include/dataobject/Public_panel.php:216
-#: ../../../include/dataobject/Public_panel.php:218
-#: ../../../include/dataobject/Public_panel.php:220
-#: ../../../include/dataobject/Public_panel.php:223
-#: ../../../include/dataobject/Public_panel.php:225
+#: ../../../include/dataobject/Public_panel.php:222
+#: ../../../include/dataobject/Public_panel.php:224
+#: ../../../include/dataobject/Public_panel.php:226
+#: ../../../include/dataobject/Public_panel.php:229
+#: ../../../include/dataobject/Public_panel.php:231
msgid "Please select the panel dimension, the value should not be zero"
msgstr "الرجاء اختيار ابعاد اللوحة.يجب اختيار قيمة من القائمة."
-#: ../../../include/dataobject/Public_panel.php:228
+#: ../../../include/dataobject/Public_panel.php:234
msgid "Please select the panel dimension, the value should not be zero."
msgstr "الرجاء اختيار ابعاد اللوحة.يجب اختيار قيمة من القائمة."
-#: ../../../include/dataobject/Public_panel.php:233
+#: ../../../include/dataobject/Public_panel.php:239
msgid "The Company name should be 125 letters max."
msgstr "اسم الشركة يجب ان لا يتجاوز 125 حرفا"
-#: ../../../include/dataobject/Public_panel.php:235
+#: ../../../include/dataobject/Public_panel.php:241
msgid "The Mother name should be 125 letters max."
msgstr "اسم الام يجب ان لا يتجاوز 125 حرفا"
-#: ../../../include/dataobject/Public_panel.php:238
+#: ../../../include/dataobject/Public_panel.php:244
msgid "The Address should be 125 letters max."
msgstr "العنوان يجب ان لا يتجاوز 125 حرفا"
-#: ../../../include/dataobject/Public_panel.php:240
+#: ../../../include/dataobject/Public_panel.php:246
msgid "The Entered telephone value should 10 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز10 حرف"
-#: ../../../include/dataobject/Public_panel.php:242
+#: ../../../include/dataobject/Public_panel.php:248
msgid "The Entered fax no should 10 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 10حرف"
-#: ../../../include/dataobject/Public_panel.php:244
+#: ../../../include/dataobject/Public_panel.php:250
msgid "The Entered Mobile no should 10 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 10حرف"
-#: ../../../include/dataobject/Public_panel.php:246
+#: ../../../include/dataobject/Public_panel.php:252
msgid "The Entered pobox value should 6 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 6حرفا"
-#: ../../../include/dataobject/Public_panel.php:248
+#: ../../../include/dataobject/Public_panel.php:254
msgid "The Entered Panel subject value should 32 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 32 حرفا"
-#: ../../../include/dataobject/Public_panel.php:250
+#: ../../../include/dataobject/Public_panel.php:256
msgid "The entered number of lanesvalue should be between 1 and 8."
msgstr "عدد المسارب بين 1 و 8"
-#: ../../../include/dataobject/Public_panel.php:252
+#: ../../../include/dataobject/Public_panel.php:258
msgid "The entered number of lanes value should be between 1 and 8."
msgstr "عدد المسارب بين 1 و 8 مسرب"
-#: ../../../include/dataobject/Public_panel.php:255
-#: ../../../include/dataobject/Public_panel.php:257
+#: ../../../include/dataobject/Public_panel.php:261
+#: ../../../include/dataobject/Public_panel.php:263
msgid "The entered shoulder width value should be between 1 and 5."
msgstr "عرض الكتف بين 1 و 5 م"
-#: ../../../include/dataobject/Public_panel.php:260
-#: ../../../include/dataobject/Public_panel.php:262
+#: ../../../include/dataobject/Public_panel.php:266
+#: ../../../include/dataobject/Public_panel.php:268
msgid "The entered carrigeway width value should be between 2 and 5."
msgstr "عرض الطريق بين 2 و 5 م"
-#: ../../../include/dataobject/Public_panel.php:264
-#: ../../../include/dataobject/Public_panel.php:266
#: ../../../include/dataobject/Public_panel.php:270
#: ../../../include/dataobject/Public_panel.php:272
+#: ../../../include/dataobject/Public_panel.php:276
+#: ../../../include/dataobject/Public_panel.php:278
msgid "The entered value should be 7 digits max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 7 احرف"
-#: ../../../include/dataobject/Public_panel.php:268
-#: ../../../include/dataobject/Public_panel.php:280
+#: ../../../include/dataobject/Public_panel.php:274
+#: ../../../include/dataobject/Public_panel.php:286
msgid "The entered value should be 125 letters max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 125 حرفا"
-#: ../../../include/dataobject/Public_panel.php:274
-#: ../../../include/dataobject/Public_panel.php:276
-#: ../../../include/dataobject/Public_panel.php:278
+#: ../../../include/dataobject/Public_panel.php:280
+#: ../../../include/dataobject/Public_panel.php:282
+#: ../../../include/dataobject/Public_panel.php:284
msgid "The entered value should be 10 digits max."
msgstr "القيمة المدخلة يجب ان لا تتجاوز 10احرف"
-#: ../../../include/dataobject/Public_panel.php:332
+#: ../../../include/dataobject/Public_panel.php:339
msgid "Company Name:"
msgstr "اسم الشركة:"
-#: ../../../include/dataobject/Public_panel.php:332
+#: ../../../include/dataobject/Public_panel.php:339
msgid "Panel Catagory:"
msgstr "فئة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:333
+#: ../../../include/dataobject/Public_panel.php:340
msgid "Ownership:"
msgstr "تابعية الشركة:"
-#: ../../../include/dataobject/Public_panel.php:334
+#: ../../../include/dataobject/Public_panel.php:341
msgid "National No.:"
msgstr "الرقم الوطني:"
-#: ../../../include/dataobject/Public_panel.php:334
+#: ../../../include/dataobject/Public_panel.php:341
msgid "Mother Name:"
msgstr "اسم الام:"
-#: ../../../include/dataobject/Public_panel.php:335
+#: ../../../include/dataobject/Public_panel.php:342
msgid "Address:"
msgstr "العنوان:"
-#: ../../../include/dataobject/Public_panel.php:335
+#: ../../../include/dataobject/Public_panel.php:342
msgid "Telephone:"
msgstr "رقم الهاتف:"
-#: ../../../include/dataobject/Public_panel.php:335
+#: ../../../include/dataobject/Public_panel.php:342
msgid "Fax No.:"
msgstr "رقم الفاكس:"
-#: ../../../include/dataobject/Public_panel.php:336
+#: ../../../include/dataobject/Public_panel.php:343
msgid "Mobile No.:"
msgstr "رقم المحمول:"
-#: ../../../include/dataobject/Public_panel.php:336
+#: ../../../include/dataobject/Public_panel.php:343
msgid "Post box:"
msgstr "صندوق البريد:"
-#: ../../../include/dataobject/Public_panel.php:337
+#: ../../../include/dataobject/Public_panel.php:344
msgid "Panel Subject:"
msgstr "غرض الاعلان:"
-#: ../../../include/dataobject/Public_panel.php:337
+#: ../../../include/dataobject/Public_panel.php:344
msgid "Route Name:"
msgstr "رقم الطريق:"
-#: ../../../include/dataobject/Public_panel.php:338
+#: ../../../include/dataobject/Public_panel.php:345
msgid "Carrigeway Width"
msgstr "عرض الطريق:"
-#: ../../../include/dataobject/Public_panel.php:338
+#: ../../../include/dataobject/Public_panel.php:345
msgid "Shoulder Width"
msgstr "عرض الكتف:"
-#: ../../../include/dataobject/Public_panel.php:339
+#: ../../../include/dataobject/Public_panel.php:346
msgid "Number Of Lanes:"
msgstr "عدد المسارب:"
-#: ../../../include/dataobject/Public_panel.php:339
+#: ../../../include/dataobject/Public_panel.php:346
msgid "Median Width:"
msgstr "يوجد جزيرة:"
-#: ../../../include/dataobject/Public_panel.php:340
-#: ../../../include/dataobject/Public_panel.php:691
-#: ../../../include/dataobject/Public_panel.php:709
+#: ../../../include/dataobject/Public_panel.php:347
+#: ../../../include/dataobject/Public_panel.php:710
+#: ../../../include/dataobject/Public_panel.php:728
msgid "Date"
msgstr "التاريخ:"
-#: ../../../include/dataobject/Public_panel.php:340
+#: ../../../include/dataobject/Public_panel.php:347
msgid "Panel distnace to route begining:"
msgstr "مسافة اللوحة من اقرب تقاطع:"
-#: ../../../include/dataobject/Public_panel.php:341
+#: ../../../include/dataobject/Public_panel.php:348
msgid "Panel distance to nearest panel:"
msgstr "المسافة من اقرب لوحة:"
-#: ../../../include/dataobject/Public_panel.php:342
+#: ../../../include/dataobject/Public_panel.php:349
msgid "Route Direction:"
msgstr "جانب الطريق:"
-#: ../../../include/dataobject/Public_panel.php:343
+#: ../../../include/dataobject/Public_panel.php:350
msgid "Notes On Location:"
msgstr "ملاحظات عن الموقع:"
-#: ../../../include/dataobject/Public_panel.php:344
+#: ../../../include/dataobject/Public_panel.php:351
msgid "Nearst Panel X:"
msgstr "احداثية X لاقرب لوحة:"
-#: ../../../include/dataobject/Public_panel.php:344
+#: ../../../include/dataobject/Public_panel.php:351
msgid "Nearst Panel Y:"
msgstr "احداثية Y لاقرب لوحة:"
-#: ../../../include/dataobject/Public_panel.php:345
+#: ../../../include/dataobject/Public_panel.php:352
msgid "Light Available"
msgstr "يوجد انارة:"
-#: ../../../include/dataobject/Public_panel.php:345
+#: ../../../include/dataobject/Public_panel.php:352
msgid "Face Count:"
msgstr "عدد الاوجه:"
-#: ../../../include/dataobject/Public_panel.php:346
+#: ../../../include/dataobject/Public_panel.php:353
msgid "Panel Type and Dimension:"
msgstr "نوع اللوحة و ابعادها:"
-#: ../../../include/dataobject/Public_panel.php:347
-#: ../../../include/dataobject/Public_panel.php:696
+#: ../../../include/dataobject/Public_panel.php:354
+#: ../../../include/dataobject/Public_panel.php:715
msgid "Panel Area"
msgstr "مساحة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:347
+#: ../../../include/dataobject/Public_panel.php:354
msgid "Annual Fees:"
msgstr "الرسوم السنوية:"
-#: ../../../include/dataobject/Public_panel.php:348
+#: ../../../include/dataobject/Public_panel.php:355
msgid "Use Fees:"
msgstr "بدل استغلال حرم الطريق"
-#: ../../../include/dataobject/Public_panel.php:349
+#: ../../../include/dataobject/Public_panel.php:356
msgid "Total Fees:"
msgstr "المجموع:"
-#: ../../../include/dataobject/Public_panel.php:349
+#: ../../../include/dataobject/Public_panel.php:356
msgid "Agreed By:"
msgstr "تم الكشف بواسطة:"
-#: ../../../include/dataobject/Public_panel.php:350
+#: ../../../include/dataobject/Public_panel.php:357
msgid "Receipt No.:"
msgstr "رقم الوصل المالي:"
-#: ../../../include/dataobject/Public_panel.php:350
+#: ../../../include/dataobject/Public_panel.php:357
msgid "Receipt Date:"
msgstr "تاريخ الوصل المالي:"
-#: ../../../include/dataobject/Public_panel.php:351
+#: ../../../include/dataobject/Public_panel.php:358
msgid "Insurance Receipt No.:"
msgstr "رقم الوصل المالي للتامين:"
-#: ../../../include/dataobject/Public_panel.php:352
+#: ../../../include/dataobject/Public_panel.php:359
msgid "Insurance Receipt Date:"
msgstr "تاريخ الوصل المالي للتأمين:"
-#: ../../../include/dataobject/Public_panel.php:352
+#: ../../../include/dataobject/Public_panel.php:359
msgid "Contract No:"
msgstr "رقم العطاء:"
-#: ../../../include/dataobject/Public_panel.php:353
+#: ../../../include/dataobject/Public_panel.php:360
msgid "Notes:"
msgstr "ملاحظات:"
-#: ../../../include/dataobject/Public_panel.php:353
+#: ../../../include/dataobject/Public_panel.php:360
msgid "Permission No.:"
msgstr "رقم الترخيص:"
-#: ../../../include/dataobject/Public_panel.php:354
-#: ../../../include/dataobject/Public_panel.php:714
+#: ../../../include/dataobject/Public_panel.php:361
+#: ../../../include/dataobject/Public_panel.php:733
msgid "Registeration No.:"
msgstr "رقم التسجيل:"
-#: ../../../include/dataobject/Public_panel.php:354
+#: ../../../include/dataobject/Public_panel.php:361
msgid "Right of Way"
msgstr "داخل الحرم"
-#: ../../../include/dataobject/Public_panel.php:357
+#: ../../../include/dataobject/Public_panel.php:362
+msgid "Contract Unit Price"
+msgstr "سعر الوحده في العطاء"
+
+#: ../../../include/dataobject/Public_panel.php:363
+msgid "Verification Receipt No"
+msgstr "رقم الوصل المالي للتصويب"
+
+#: ../../../include/dataobject/Public_panel.php:364
+msgid "Verification Receipt Date"
+msgstr "تاريخ الوصل المالي للتصويب"
+
+#: ../../../include/dataobject/Public_panel.php:365
+msgid "Verification Amount"
+msgstr "قيمة وصل تصويب المخالفة"
+
+#: ../../../include/dataobject/Public_panel.php:368
msgid "Advertisement Panel Information Data Entry"
msgstr "ادخال معلومات اللوحات الاعلانية"
-#: ../../../include/dataobject/Public_panel.php:359
+#: ../../../include/dataobject/Public_panel.php:370
#, php-format
msgid "%s: The value you have entered is not valid."
msgstr "%s:القيمة المدخلة غير مقبولة."
-#: ../../../include/dataobject/Public_panel.php:360
+#: ../../../include/dataobject/Public_panel.php:371
#, php-format
msgid "%s: This field is required."
msgstr "%s: يجب ادخال هذا الحقل."
-#: ../../../include/dataobject/Public_panel.php:579
+#: ../../../include/dataobject/Public_panel.php:598
msgid "Select One"
msgstr "اختر واحد"
-#: ../../../include/dataobject/Public_panel.php:657
+#: ../../../include/dataobject/Public_panel.php:676
msgid "Contract"
msgstr "عطاء"
-#: ../../../include/dataobject/Public_panel.php:657
+#: ../../../include/dataobject/Public_panel.php:676
msgid "Private"
msgstr "قطاع خاص"
-#: ../../../include/dataobject/Public_panel.php:657
+#: ../../../include/dataobject/Public_panel.php:676
msgid "Goverment"
msgstr "حكومي"
-#: ../../../include/dataobject/Public_panel.php:663
+#: ../../../include/dataobject/Public_panel.php:682
msgid "Panel catagory"
msgstr "فئة اللوحة"
-#: ../../../include/dataobject/Public_panel.php:671
+#: ../../../include/dataobject/Public_panel.php:690
msgid "Median available"
msgstr "يوجد جزيرة"
-#: ../../../include/dataobject/Public_panel.php:673
+#: ../../../include/dataobject/Public_panel.php:692
msgid "Panel image"
msgstr "صورة اللو\xD8\xADة:"
-#: ../../../include/dataobject/Public_panel.php:678
+#: ../../../include/dataobject/Public_panel.php:697
msgid "Panel Area:"
msgstr "مساحة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:680
-#: ../../../include/dataobject/Public_panel.php:698
+#: ../../../include/dataobject/Public_panel.php:699
+#: ../../../include/dataobject/Public_panel.php:717
msgid "Use fees"
msgstr "بدل استغلال حرم الطريق"
-#: ../../../include/dataobject/Public_panel.php:682
-#: ../../../include/dataobject/Public_panel.php:700
+#: ../../../include/dataobject/Public_panel.php:701
+#: ../../../include/dataobject/Public_panel.php:719
msgid "Annualfees"
msgstr "الرسوم السنوية:"
-#: ../../../include/dataobject/Public_panel.php:684
-#: ../../../include/dataobject/Public_panel.php:702
+#: ../../../include/dataobject/Public_panel.php:703
+#: ../../../include/dataobject/Public_panel.php:721
msgid "Total fees"
msgstr "المجموع"
-#: ../../../include/dataobject/Public_panel.php:720
+#: ../../../include/dataobject/Public_panel.php:739
msgid "Total fees:"
msgstr "مجموع الرسوم:"
-#: ../../../include/dataobject/Public_panel.php:726
+#: ../../../include/dataobject/Public_panel.php:745
msgid "Right of Way:"
msgstr "داخل الحرم:"
-#: ../../../include/dataobject/Public_panel.php:769
+#: ../../../include/dataobject/Public_panel.php:788
msgid "ID"
msgstr "رقم التعريف"
-#: ../../../include/dataobject/Public_panel.php:770
+#: ../../../include/dataobject/Public_panel.php:789
msgid "Company name"
msgstr "اسم الشركة"
-#: ../../../include/dataobject/Public_panel.php:771
+#: ../../../include/dataobject/Public_panel.php:790
msgid "National number"
msgstr "الرقم الوطني:"
-#: ../../../include/dataobject/Public_panel.php:772
+#: ../../../include/dataobject/Public_panel.php:791
msgid "Mother name"
msgstr "اسم الام:"
-#: ../../../include/dataobject/Public_panel.php:773
+#: ../../../include/dataobject/Public_panel.php:792
msgid "Address"
msgstr "العنوان:"
-#: ../../../include/dataobject/Public_panel.php:774
+#: ../../../include/dataobject/Public_panel.php:793
msgid "Telephone no."
msgstr "رقم الهاتف:"
-#: ../../../include/dataobject/Public_panel.php:775
+#: ../../../include/dataobject/Public_panel.php:794
msgid "Fax no."
msgstr "رقم الفاكس:"
-#: ../../../include/dataobject/Public_panel.php:776
+#: ../../../include/dataobject/Public_panel.php:795
msgid "Mobile no."
msgstr "رقم المحمول:"
-#: ../../../include/dataobject/Public_panel.php:793
+#: ../../../include/dataobject/Public_panel.php:812
msgid "[View on Map]"
msgstr "[اظهار على الخريطة]"
-#: ../../../include/dataobject/Public_panel.php:799
+#: ../../../include/dataobject/Public_panel.php:818
msgid "[Edit]"
msgstr "[تحرير]"
Modified: trunk/rapc/panelinstallation_report.php
===================================================================
--- trunk/rapc/panelinstallation_report.php 2007-01-10 13:08:39 UTC (rev 32)
+++ trunk/rapc/panelinstallation_report.php 2007-01-11 11:51:13 UTC (rev 33)
@@ -97,12 +97,12 @@
left outer join routetype on (routetype.codedvalue=panel.routetype) left outer
join facecount on (facecount.codedvalue=panel.facecount) ".$strWhere;
*/
-$strQuery="select companyname,panelsubject,routetype,routename,dimension,boolrow,
-sum(totalfees),facecount,count(*),usefees,insurance,receiptno,recEiptdate,
-insurancereceiptdate
+$strQuery="select companyname,registerno,panelsubject,routetype,routename,dimension,boolrow,
+sum(totalfees),usefees,facecount,count(*) as panelcount,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";
+insurancereceiptdate,boolrow,registerno,insurancereceiptno,date";
//print_r($strQuery);
$objTable = new DbTable($DccssPage->postgis->db, $strQuery);
Modified: trunk/rapc/reports.php
===================================================================
--- trunk/rapc/reports.php 2007-01-10 13:08:39 UTC (rev 32)
+++ trunk/rapc/reports.php 2007-01-11 11:51:13 UTC (rev 33)
@@ -37,6 +37,10 @@
_("Authorized Panel installation").'</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>
+ <li><a href="contract_panel_report.php?PHPSESSID=session_id()">'.
+ _("Contract Panel installation").'</a></li>
</ul>
Modified: trunk/rapc/script/create_views.sql
===================================================================
--- trunk/rapc/script/create_views.sql 2007-01-10 13:08:39 UTC (rev 32)
+++ trunk/rapc/script/create_views.sql 2007-01-11 11:51:13 UTC (rev 33)
@@ -32,7 +32,7 @@
panel.totalfees,panel.usefees,
panel.receiptno,panel.receiptdate,panel.insurancereceiptno,
panel.insurancereceiptdate,panel.notes,panel.verificationreceiptno,
- panel.verificationreceiptdate
+ panel.verificationreceiptdate,panel.x,panel.y,panel.annualfees,panel.registerno
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-05 12:39:30
|
Revision: 40
http://svn.sourceforge.net/rapc/?rev=40&view=rev
Author: maher_karim
Date: 2007-02-05 04:39:28 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
2007-02-05 Maher Abdel karim <mah...@do...>
* doc/user/en/rapc_user_guide.xml:update user guide.
* include/i18n.php:add translation.
* include/dataobject/Public_panel.php:Add more validation.
* authorized_panel_report.php:
* contract_panel_report.php:
* illegal_panelinstallation_report.php:
* map.php:
* panelinstallation_report.php:
* panelpage.php:
* paneltypes_report.php:
* query.php:Adjust the application based on MPWH remarks.
Modified Paths:
--------------
trunk/rapc/authorized_panel_report.php
trunk/rapc/changelog
trunk/rapc/contract_panel_report.php
trunk/rapc/doc/administration/rapc_administration_guide.xml
trunk/rapc/doc/build.xml
trunk/rapc/doc/user/en/rapc_user_guide.xml
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/map.php
trunk/rapc/panelinstallation_report.php
trunk/rapc/panelpage.php
trunk/rapc/paneltypes_report.php
trunk/rapc/query.php
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:54
|
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X