Thread: [Rapc-commit] SF.net SVN: rapc: [51] trunk/rapc (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 51
          http://svn.sourceforge.net/rapc/?rev=51&view=rev
Author:   maher_karim
Date:     2007-02-11 04:32:41 -0800 (Sun, 11 Feb 2007)

Log Message:
-----------
2006-09-11  Maher Abdel karim <mah...@do...>

	* include/i18n.php:
	* ar/LC_MESSAGES/rapc.po:Adjust missing translation.
	* include/dataobject/public_panel.php:Add new validation for boolrow.
	* contract_panel_report.php:adjust the POST checking.
	

Modified Paths:
--------------
    trunk/rapc/changelog
    trunk/rapc/contract_panel_report.php
    trunk/rapc/include/dataobject/Public_panel.php
    trunk/rapc/include/i18n.php
    trunk/rapc/locale/ar/LC_MESSAGES/rapc.po

Modified: trunk/rapc/changelog
===================================================================

--- trunk/rapc/changelog	2007-02-08 07:14:21 UTC (rev 50)
+++ trunk/rapc/changelog	2007-02-11 12:32:41 UTC (rev 51)
@@ -1,3 +1,10 @@
+2006-09-11  Maher Abdel karim <mah...@do...>
+
+	* include/i18n.php:
+	* ar/LC_MESSAGES/rapc.po:Adjust missing translation.
+	* include/dataobject/public_panel.php:Add new validation for boolrow.
+	* contract_panel_report.php:adjust the POST checking.
+	
 2007-02-05  Maher Abdel karim <mah...@do...>
 
 	* doc/user/en/rapc_user_guide.xml:update user guide.

Modified: trunk/rapc/contract_panel_report.php
===================================================================
--- trunk/rapc/contract_panel_report.php	2007-02-08 07:14:21 UTC (rev 50)
+++ trunk/rapc/contract_panel_report.php	2007-02-11 12:32:41 UTC (rev 51)
@@ -36,7 +36,7 @@
 // Add some elements to the form
 $Queryform->addElement('header', null, _('Panel Installation'));
 // fill the array with district information.
-$link   = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], "mpw_ris", "mpw_ris")
+$link   = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], $_SESSION["strOracleUser"], $_SESSION["strOraclePassword"])
 or die("Could not connect to Oracle");
 
 $result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
@@ -60,34 +60,34 @@
 $DccssPage->add($Queryform->tohtml());
 $strWhere ='';
 //print_r($_POST['district']);
-if ($_POST['district']!=''){
+if ($_POST['district']!='0'){
   $strWhere = $strWhere."where contractno<>'' and panel.district='".$Queryform->exportvalue('district')."'";
-  
+
 } else {
   $strWhere = $strWhere."where panel.district<>'' and contractno<>'' ";
 }
   if (($_POST['fromdate']['d']!=0)&&($_POST['fromdate']['m']!=0)&&($_POST['fromdate']['Y']!=0)) {
     $strWhere = $strWhere . " and date >=to_date('".$_POST['fromdate']['Y']."-".
     $_POST['fromdate']['m']."-".$_POST['fromdate']['d']."','YYYY-MM-dd')";
-  
-  
+
+
   } elseif (($_POST['todate']['d']!=0)&&($_POST['todate']['m']!=0)&&($_POST['todate']['Y']!=0)){
    $strWhere = $strWhere . " and date <= to_date('".$_POST['todate']['Y']."-".
       $_POST['todate']['m']."-".$_POST['todate']['d']."','YYYY-MM-dd')";
   }
 
-  
 
 
 
-$strQuery = "select contractno,count(CASE routetype WHEN 1 THEN 1 END) as 
+
+$strQuery = "select contractno,count(CASE routetype WHEN 1 THEN 1 END) as
 Main, count(CASE routetype WHEN 2 THEN 1 END) as Secondary,
 count(CASE routetype WHEN 3 THEN 1 END) as Village,companyname,registerno,
 paneldimension.description as dimension,
 facecount,count(*) as totalpanels,sum(totalfees) as fees,
-sum(contractunitprice) as pedding, ((sum(totalfees)+ sum(contractunitprice))*count(*)) as total
+sum(contractunitprice) as pedding, ((sum(totalfees)+ sum(contractunitprice))) as total
 
-from panel left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension) ".$strWhere." 
+from panel left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension) ".$strWhere."
 group by contractno,companyname,registerno,paneldimension.description,facecount";
 
 //print_r($strQuery);

Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php	2007-02-08 07:14:21 UTC (rev 50)
+++ trunk/rapc/include/dataobject/Public_panel.php	2007-02-11 12:32:41 UTC (rev 51)
@@ -4,54 +4,54 @@
  */
 require_once 'DB/DataObject.php';
 
-class DataObject_Public_panel extends DB_DataObject 
+class DataObject_Public_panel extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     var $__table = 'public.panel';                    // table name
-    var $id;                              // int4(4)  
+    var $id;                              // int4(4)
     var $district;                        // int4(4)
     var $panelcatagory;                   // int4(4)
-    var $companyname;                     // varchar(-1)  
-    var $nationalno;                      // varchar(-1)  
-    var $mothername;                      // varchar(-1)  
-    var $address;                         // varchar(-1)  
-    var $teleno;                          // varchar(-1)  
-    var $faxno;                           // varchar(-1)  
-    var $mobileno;                        // varchar(-1)  
-    var $pobox;                           // varchar(-1)  
-    var $panelsubject;                    // varchar(-1)  
-    var $roadname;                        // varchar(-1)  
-    var $routename;                       // varchar(-1)  
-    var $carrigewaywidth;                 // int4(4)  
-    var $shoulderwidth;                   // int4(4)  
-    var $numberoflanes;                   // int4(4)  
-    var $medianwidth;                     // int4(4)  
-    var $date;                            // date(4)  
-    var $x;                               // float4(4)  
-    var $y;                               // float4(4)  
-    var $routetodistance;                 // int4(4)  
-    var $paneltodistance;                 // int4(4)  
-    var $routedirection;                  // int4(4)  
-    var $notesonlocation;                 // varchar(-1)  
-    var $nearstpanelx;                    // float4(4)  
-    var $nearstpanely;                    // float4(4)  
-    var $lightavailable;                  // int4(4)  
-    var $facecount;                      // int4(4)  
-    var $routetype;                       // int4(4)  
-    var $paneltype;                       // int4(4)  
-    var $paneldimension;                  // int4(4)  
-    var $panelarea;                       // int4(4)  
-    var $annualfees;                      // float4(4)  
-    var $usefees;                         // float4(4)  
-    var $totalfees;                       // float4(4)  
-    var $agreedby;                        // varchar(-1)  
-    var $receiptno;                       // varchar(-1)  
-    var $receiptdate;                     // date(4)  
-    var $contractno;                      // varchar(-1)  
-    var $notes;                           // varchar(-1)  
-    var $the_geom;                        // geometry(-1)  
+    var $companyname;                     // varchar(-1)
+    var $nationalno;                      // varchar(-1)
+    var $mothername;                      // varchar(-1)
+    var $address;                         // varchar(-1)
+    var $teleno;                          // varchar(-1)
+    var $faxno;                           // varchar(-1)
+    var $mobileno;                        // varchar(-1)
+    var $pobox;                           // varchar(-1)
+    var $panelsubject;                    // varchar(-1)
+    var $roadname;                        // varchar(-1)
+    var $routename;                       // varchar(-1)
+    var $carrigewaywidth;                 // int4(4)
+    var $shoulderwidth;                   // int4(4)
+    var $numberoflanes;                   // int4(4)
+    var $medianwidth;                     // int4(4)
+    var $date;                            // date(4)
+    var $x;                               // float4(4)
+    var $y;                               // float4(4)
+    var $routetodistance;                 // int4(4)
+    var $paneltodistance;                 // int4(4)
+    var $routedirection;                  // int4(4)
+    var $notesonlocation;                 // varchar(-1)
+    var $nearstpanelx;                    // float4(4)
+    var $nearstpanely;                    // float4(4)
+    var $lightavailable;                  // int4(4)
+    var $facecount;                      // int4(4)
+    var $routetype;                       // int4(4)
+    var $paneltype;                       // int4(4)
+    var $paneldimension;                  // int4(4)
+    var $panelarea;                       // int4(4)
+    var $annualfees;                      // float4(4)
+    var $usefees;                         // float4(4)
+    var $totalfees;                       // float4(4)
+    var $agreedby;                        // varchar(-1)
+    var $receiptno;                       // varchar(-1)
+    var $receiptdate;                     // date(4)
+    var $contractno;                      // varchar(-1)
+    var $notes;                           // varchar(-1)
+    var $the_geom;                        // geometry(-1)
     var $insurancereceiptno;
     var $ownership;
     var $insurancereceiptdate;
@@ -65,7 +65,7 @@
     var $verificationreceiptno;
     var $verificationreceiptdate;
     var $verificationamount;
-    
+
     /* ZE2 compatibility trick*/
     function __clone() { return $this;}
 
@@ -76,20 +76,20 @@
     ###END_AUTOCODE
     function table() {
     //return array_merge(parent::table(), array('x' => 0, 'y' => 0));
-    $hierselects = array(); 
-      foreach ($this->conditionalFields as $virtualfield => $cf) { 
-        $hierselects[$virtualfield] = DB_DATAOBJECT_STR; 
-      } 
+    $hierselects = array();
+      foreach ($this->conditionalFields as $virtualfield => $cf) {
+        $hierselects[$virtualfield] = DB_DATAOBJECT_STR;
+      }
       foreach ($this->panelFields as $fields => $field){
 	 $hierselects[$fields] = DB_DATAOBJECT_STR;
       }
-      return array_merge(parent::table(), $hierselects); 
+      return array_merge(parent::table(), $hierselects);
   }
   var $fb_textFields = array('notes','address','notesonlocation','panelsubject');
   var $fb_fieldsToRender = array( 'registerno','panelcatagory','companyname','ownership',
   'nationalno', 'mothername',
     'address', 'teleno', 'faxno',
-    'mobileno', 'pobox', 'panelsubject','road_route_district', 
+    'mobileno', 'pobox', 'panelsubject','road_route_district',
     'carrigewaywidth', 'shoulderwidth', 'numberoflanes',
     'medianwidth','date','x','y','routetodistance','paneltodistance',
     'routedirection','notesonlocation','nearstpanelx','nearstpanely',
@@ -98,12 +98,12 @@
     'receiptdate','insurancereceiptno','insurancereceiptdate',
     'contractno','notes','idroadiddistrict','permitno','contractunitprice',
   'verificationreceiptno','verificationreceiptdate','verificationamount','image','boolrow');
-    
+
     var $fb_preDefOrder = array( 'companyname','panelcatagory', 'ownership',
     'registerno',
     'nationalno', 'mothername',
     'address', 'teleno', 'faxno',
-    'mobileno', 'pobox', 'panelsubject','road_route_district', 'carrigewaywidth', 
+    'mobileno', 'pobox', 'panelsubject','road_route_district', 'carrigewaywidth',
     'shoulderwidth', 'numberoflanes',
     'medianwidth','date','routetodistance','x','y',
     'routedirection','notesonlocation','paneltodistance','nearstpanelx','nearstpanely',
@@ -112,45 +112,45 @@
     'receiptdate','insurancereceiptno','insurancereceiptdate',
   'verificationreceiptno','verificationreceiptdate','verificationamount',
     'contractno','contractunitprice','notes','image','idroadiddistrict');
-   
+
    var $fb_linkElementTypes = array('facecount' => 'radio');
    var $fb_enumFields = array('facecount');
 
   var $fb_enumOptions = array('facecount' => array('1' => '1', '2' => '2'));
-    
-var $fb_selectAddEmpty = array('ownership'); 
 
-   var $conditionalFields = array( 
-      'road_route_district' => array( 
-        'district:public.panel'  => array('district'), 
+var $fb_selectAddEmpty = array('ownership');
+
+   var $conditionalFields = array(
+      'road_route_district' => array(
+        'district:public.panel'  => array('district'),
         'roadname:public.panel' => array('district', 'roadname'),
 	'routename:public.panel' => array('district', 'roadname','routename')
-      ) 
-    ); 
+      )
+    );
 
-var $panelFields = array( 
-    'paneltypedimension' => array( 
-        'routetype'  => array('routetype'), 
+var $panelFields = array(
+    'paneltypedimension' => array(
+        'routetype'  => array('routetype'),
         'paneltype' => array('routetype', 'paneltype'),
 	'paneldimension' => array('routetype', 'paneltype','paneldimension')
-	
-      ) 
-    ); 
-    
+
+      )
+    );
+
  function postGenerateForm(&$form) {
     /**
      * \todo Use regular expressions for rules.
-      */ 
+      */
   $form->addRule('x', _('Please Enter the X coordinate for the panel.'),
   'required', null, $_SESSION["strHtmlQuickFormValidation"]);
-  
+
   $form->addRule('receiptno', _('Please Enter the receipt no. for the panel.'),
   'required', null, $_SESSION["strHtmlQuickFormValidation"]);
   $form->addRule('receiptdate', _('Please Enter the receipt date for the panel.'),
   'required', null, $_SESSION["strHtmlQuickFormValidation"]);
-  
-  
-  
+
+
+
   $form->addRule('y', _('Please Enter the Y coordinate for the panel.'),
   'required', null, $_SESSION["strHtmlQuickFormValidation"]);
   $form->addRule('routetodistance', _('Please Enter the distance from the link start.'),
@@ -173,10 +173,10 @@
   'numeric', null, $_SESSION["strHtmlQuickFormValidation"]);
   $form->addRule('paneltypedimension', _('Please select the panel type and dimension.'),
   'required', null, $_SESSION["strHtmlQuickFormValidation"]);
- 
+
   $form->addRule('permitno', _('Please select the permission no.'),
   'required', null, $_SESSION["strHtmlQuickFormValidation"]);
-  
+
   /*$form->addRule('annualfees', _('Please enter the annual fees.'),
   'required', null, $_SESSION["strHtmlQuickFormValidation"]);
   $form->addRule('usefees', _('Please enter the use fees.'),
@@ -188,16 +188,16 @@
   */
 
   //from Areejs comments
-  
+
   $form->addRule('image', _('The image type should be JPG.'),
   'filename', '/.*\.[jJ][pP][gG]$/','client');
   //Letters only
-  
+
   $form->addRule('companyname', _('The Company name should be only letters.'),
   'regex','/^[^1234567890]*$/','client');
   $form->addRule('mothername', _('The Mother name should be only letters.'),
   'lettersonly',null,'client');
-  
+
   $form->addRule('nationalno', _('The National No. should be only numeric.'),
   'numeric',null,'client');
   $form->addRule('nationalno', _('The entered value should be only numeric.'),
@@ -218,7 +218,7 @@
   'numeric',null,'client');
   $form->addRule('insurancereceiptno', _('The entered value should be only numeric.'),
   'numeric',null,'client');
-  
+
   $form->addRule('annualfees', _('Please select the panel dimension, the value should not be zero'),
   'numeric',null,'client');
   $form->addRule('panelarea', _('Please select the panel dimension, the value should not be zero'),
@@ -230,17 +230,17 @@
   'nonzero',null,'client');
   $form->addRule('panelarea', _('Please select the panel dimension, the value should not be zero'),
   'nonzero',null,'client');
- 
+
   $form->addRule('totalfees', _('Please select the panel dimension, the value should not be zero.'),
   'nonzero',null,'client');
-  
-  
+
+
   //Max length
   $form->addRule('companyname', _('The Company name should be 125 letters max.'),
   'maxlength',125);
   $form->addRule('mothername', _('The Mother name should be 125 letters max.'),
   'maxlength',32);
-  
+
   $form->addRule('address', _('The Address should be 125 letters max.'),
   'maxlength',125,'client');
   $form->addRule('telno', _('The Entered telephone value should 10 letters max.'),
@@ -257,12 +257,12 @@
   'rangelength',array(0,1),'client');
   $form->addRule('numberoflanes', _('The entered number of lanes value should be between 1 and 8.'),
   'regex','/^[^90A-z]*$/','client');
-  
+
    // $form->addRule('shoulderwidth', _('The entered shoulder width value should be between 1 and 5.'),
   //'rangelength',array(0,1),'client');
   // $form->addRule('shoulderwidth', _('The entered shoulder width value should be between 1 and 5.'),
   //'regex','/^[^67890A-z]*$/','client');
-  
+
     $form->addRule('carrigewaywidth', _('The entered carrigeway width value should be between 2 and 5.'),
   'rangelength',array(0,1),'client');
      $form->addRule('carrigewaywidth', _('The entered carrigeway width value should be between 2 and 5.'),
@@ -285,15 +285,15 @@
   'maxlength', 10);
   $form->addRule('notes', _('The entered value should be 125 letters max.'),'maxlength',
   125);
-  
-  
+
+
  $form->Applyfilter('__ALL__',trim);
       $form->setRequiredNote('<span style="font-size:80%; color:#ff0000;"
   	>*</span><span style="font-size:80%;"> '.
   	_('denotes required field').'</span>');
 	$form->setDefaults(array('panelcatagory'=>3,'facecount'=>1,'boolrow'=>1));
  }
-  
+
   function update($do = false) {
     if(isset($this->x)&&isset($this->y)) {
       $this->the_geom = 'POINT('.$this->x.' '.$this->y.')';
@@ -304,7 +304,7 @@
       //$this->image='test';
       unset ($_SESSION['routetypevalue']);
     }
-   
+
     return parent::update($do);
   }
 
@@ -319,8 +319,8 @@
     // $this->image='test';
       unset ($_SESSION['routetypevalue']);
     }
-   
 
+
     return parent::insert();
   }
 
@@ -330,13 +330,13 @@
       isset($_REQUEST['y'])&&is_numeric($_REQUEST['y'])) {
       $this->x = (float) $_REQUEST['x'];
       $this->y = (float) $_REQUEST['y'];
-      
+
       $objDB =& $this->getDatabaseConnection();
     }
   }
-function preGenerateForm(&$fb){ 
-  
-  $this->fb_fieldLabels = array('companyname'=>_('Company Name:'),'panelcatagory' =>_('Panel Catagory:'), 
+function preGenerateForm(&$fb){
+
+  $this->fb_fieldLabels = array('companyname'=>_('Company Name:'),'panelcatagory' =>_('Panel Catagory:'),
   'ownership'=>_('Ownership:'),
   'nationalno'=>_('National No.:'),'mothername'=>_('Mother Name:'),
   'address'=>_('Address:'),'teleno'=>_('Telephone:'),'faxno'=>_('Fax No.:'),
@@ -363,30 +363,32 @@
   'verificationreceiptno'=>_("Verification Receipt No"),
   'verificationreceiptdate'=>_("Verification Receipt Date"),
   'verificationamount'=>_("Verification Amount"));
-  
-  
+
+
   $this->fb_formHeaderText= _('Advertisement Panel Information Data Entry');
-  $this->fb_preDefElements = array(); 
+  $this->fb_preDefElements = array();
   $this->fb_ruleViolationMessage =  _('%s: The value you have entered is not valid.');
   $this->fb_requiredRuleMessage =  _('%s: This field is required.');
   $this->fb_submitText = _('Submit');
-  /* the hierselect construct */ 
+  /* the hierselect construct */
   $month = date('m');
   foreach ($this->panelFields as $fields => $field){
-  $desc = (isset($this->fb_fieldLabels[$fields])?$this->fb_fieldLabels[$fields]:$fields); 
+  $desc = (isset($this->fb_fieldLabels[$fields])?$this->fb_fieldLabels[$fields]:$fields);
   // $attrs = array('onchange' =>
   //"javascript:alert(this.options[this.selectedIndex].value);");
   $attrs = array('onchange' =>
   "javascript:getcost(this.options[this.selectedIndex].value);",'onblur' =>
   "javascript:getcost(this.options[this.selectedIndex].value);",'onclick' =>
   "javascript:getcost(this.options[this.selectedIndex].value);");
-	  
+
   echo '<script type="text/javascript">
   <!--
   function setitems(val){
-    if (val==1){  
+    if (val==1){
     document.forms[2].contractno.disabled=false
     document.forms[2].contractunitprice.disabled=false
+    document.forms[2].boolrow.value=2
+
     }
     if (val==3){
     document.forms[2].companyname.disabled=false
@@ -416,36 +418,38 @@
     document.forms[2].contractno.disabled=true
     document.forms[2].contractunitprice.disabled=true
     }
-    
-  
+
+
   }
   function getcost(val){
   if ( 2 ) {
-  
+
   //alert (val);
   var passed = val;
 
   var xpanel;
   var Startindex = document.forms[2][38].value.search(/ /);
-  
+
   var Startannual = document.forms[2][38].value.search(/-/);
   xpanel=document.forms[2][38].value.substr(0,Startindex);
   var ypanel=document.forms[2][38].value.substr(Startindex+2,Startannual-(Startindex+2));
-  //Working to fill the area field. 
+  //Working to fill the area field.
   //document.forms[2].panelarea.value=document.forms[2][38].value;
   document.forms[2].panelarea.value=parseInt(ypanel*xpanel);
-  
-  
+
+
   var StartUse = document.forms[2][38].value.search(/M/);
   var StartPanel = document.forms[2][38].value.search(/P/);
   //Check the annual fees
   document.forms[2].annualfees.value=document.forms[2][38].value.substr(Startannual+1,StartUse-(Startannual+1));
   ////Check the Use fees
+  if (document.forms[2].boolrow.value!=2){
   document.forms[2].usefees.value=document.forms[2][38].value.substr(StartUse+1,StartPanel-(StartUse+1));
+  }
   var annualfees = (document.forms[2][38].value.substr(Startannual+1,StartUse-(Startannual+1)));
   var usefees=document.forms[2][38].value.substr(StartUse+1);
   //Check face count
-  
+
   if(document.forms[2].facecount.length == undefined)
   if(document.forms[2].facecount.checked)
 	return document.forms[2].facecount.value;
@@ -456,34 +460,34 @@
     var facecount= document.forms[2].facecount[i].value;
   }
   }
-  
+
   //alert (facecount);
   var startmonth=document.forms[2][22].value;
   //alert (startmonth);
   var varannualfees=document.forms[2].annualfees.value;
   var varusefees=document.forms[2].usefees.value;
-  
-  
+
+
   var totalfees = (((ypanel*xpanel) * annualfees * facecount)+ parseInt(usefees))*((13-startmonth)/12);
   document.forms[2].totalfees.value=parseInt(totalfees);
-  
-  
+
+
   var applicationtype='; print_r("'".$_REQUEST['type']."'");
   echo ';
-  
-  
 
+
+
   }
-  
+
   }
   function checkvalue(val){
-  alert ("Hello"); 
+  alert ("Hello");
   }
-  
+
   function getpanelcost(){
-   
+
   var panelarea2=parseInt(document.forms[2].panelarea.value);
-  
+
   var annualfees2=parseInt(document.forms[2].annualfees.value);
   if(document.forms[2].facecount.length == undefined)
     if(document.forms[2].facecount.checked)
@@ -495,19 +499,19 @@
 	var facecount= document.forms[2].facecount[i].value;
       }
     }
-  
-  
+
+
   var usefees2=parseInt(document.forms[2].usefees.value);
   var startmonth=document.forms[2][22].value;
   if ((document.forms[2].annualfees.value!=0)){
     var totalfeesclick = (((panelarea2*annualfees2)*facecount)+usefees2)*((13-startmonth)/12);
     document.forms[2].totalfees.value=totalfeesclick;
-   
+
   }
-  }  
-    
-  
-  
+  }
+
+
+
   function setface(val){
     if (val==2){
     document.forms[2][34].disabled=true
@@ -515,7 +519,7 @@
     document.forms[2][33].checked=true
     }else{
     document.forms[2][34].disabled=false
-    
+
     }
   }
   function getpaneltype(val){
@@ -530,7 +534,7 @@
   // alert("test1");
   selectedvalue=1;
   paneldimension="14 X 4-50M1000P1";
-  
+
   }
   //alert (secondaryindex)
   if((routetypeindex == 3)&&(secondaryindex==-1)) {
@@ -541,47 +545,47 @@
   }
   if((routetypeindex> 3)&&(secondaryindex!=-1)) {
   //Village
-  
+
   selectedvalue=3;
   paneldimension="3 X 2-20M100P4";
   }
-  
+
   document.forms[2][36].value=selectedvalue;
   document.forms[2][36].disabled=true;
   document.forms[2].routetypevalue.value=selectedvalue;
-  
+
   //alert (selectedvalue);
   }
   //checkvalue(1);
   _hs_swapOptions(document.forms[2],"paneltypedimension",0);
   getcost(1);
-  
+
   }
   //-->
-  </script>'; 
-  
+  </script>';
+
   //065699071
   //Add break after each hierselect.
   //$hierselectPanel =& HTML_QuickForm::createElement('hierselect', $fb->getFieldName($fields), $desc,$attrs,"<br />");
   $hierselectPanel =& HTML_QuickForm::createElement('hierselect', $fb->getFieldName($fields), $desc,$attrs);
-  
-  
+
+
   $link   = dbx_connect(DBX_PGSQL, "localhost", "rapc", $_SESSION['UserName'],$_SESSION['Password'])
   or die("Could not connect to PostgreSQL");
-  
+
   $result = dbx_query($link, "select 0, '[Select One]' union all select codedvalue,description from routetype");
   $select1 = array();
-  
+
   foreach ($result->data as $row) {
   $codedvalue=$row[0];
   $descriptioin = $row[1];
   $select1[$codedvalue]=_($descriptioin);
   }
-    
+
   $result = dbx_query($link, "select 0,0, '[Select One]' union all select routetype,paneltype,paneltype.description from
   typedimensionfees,paneltype where paneltype.codedvalue = typedimensionfees.paneltype");
   $select2 = array();
-  
+
   foreach ($result->data as $row) {
   $routetype = $row[0];
   $codedvalue=$row[1];
@@ -589,10 +593,10 @@
   $select2[$routetype][$codedvalue]=_($descriptioin);
   }
   $result = dbx_query($link, "select routetype,paneltype,
-  paneldimension.description,paneldimension.description,annualfees.description 
+  paneldimension.description,paneldimension.description,annualfees.description
   ,usefees.description,paneldimension from
-  typedimensionfees,usefees,paneldimension,annualfees where paneldimension.codedvalue = 
-  typedimensionfees.paneldimension and annualfees.codedvalue=annualfees and 
+  typedimensionfees,usefees,paneldimension,annualfees where paneldimension.codedvalue =
+  typedimensionfees.paneldimension and annualfees.codedvalue=annualfees and
   usefees.codedvalue=usefees");
   $select3 = array();
   $select3[0][0][0]= _('Select One');
@@ -604,17 +608,17 @@
   $annual = $row[4];
   $usefees = $row[5];
   $paneldimension = $row[6];
-  
-  
+
+
   $select3[$routetype][$codedvalue][$descriptioin."-".$annual."M".
   $usefees."P".$paneldimension]=_($descriptioin);
   }
-  $hierselectPanel->setOptions(array($select1,$select2,$select3)); 
-  
+  $hierselectPanel->setOptions(array($select1,$select2,$select3));
+
   $this->fb_preDefElements[$fields] = $hierselectPanel;
-  }      
-  
-  foreach ($this->conditionalFields as $virtualfield => $cf) { 
+  }
+
+  foreach ($this->conditionalFields as $virtualfield => $cf) {
   $desc = (isset($this->fb_fieldLabels[$virtualfield])?$this->fb_fieldLabels[$virtualfield]:$virtualfield);
   $attrs = array('onchange' =>
   "javascript:getpaneltype(this.options[this.selectedIndex].value);",'onblur' =>
@@ -622,37 +626,37 @@
   "javascript:getpaneltype(this.options[this.selectedIndex].value);",
   'onselect' =>
   "javascript:getpaneltype(this.options[this.selectedIndex].value);");
-  
+
   $hierselect =& HTML_QuickForm::createElement('hierselect', $fb->getFieldName($virtualfield), $desc,$attrs);
-  $link   = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], "mpw_ris", "mpw_ris")
-      
+  $link   = dbx_connect(DBX_OCI8, "",$_SESSION["strOracleServer"], $_SESSION["strOracleUser"], $_SESSION["strOraclePassword"])
+
       or die("Could not connect to Oracle");
-  
+
   $result = dbx_query($link, 'select ddomains_text from roadnameswithdistrict group by ddomains_text');
   $select1 = array();
   foreach ($result->data as $row) {
-  
+
   //foreach ($row as $field) {
   $district=$row[0];
   $select1[$district]=_($district);
   //}
-  
+
   }
-  
+
   $result = dbx_query($link, 'select * from roadnameswithdistrict');
   $select2 = array();
   foreach ($result->data as $row){
   $district= $row[3];
   $roadname = $row[1];
   $select2[$district][$roadname]=$roadname;
-  
+
   }
   //select routenameswithdistrict.routename,flatfeatures_cway.cway_width_B,
   //flatfeatures_cway.cway_nrlane_b,flatfeatures_shoul.SHOUL_WIDTH_B from
-  //routenameswithdistrict left outer join flatfeatures_cway on 
-  //(routenameswithdistrict.routename=flatfeatures_cway.routename) left outer join 
-  // flatfeatures_shoul on (routenameswithdistrict.routename=flatfeatures_shoul.routename) 
-  
+  //routenameswithdistrict left outer join flatfeatures_cway on
+  //(routenameswithdistrict.routename=flatfeatures_cway.routename) left outer join
+  // flatfeatures_shoul on (routenameswithdistrict.routename=flatfeatures_shoul.routename)
+
   $result = dbx_query($link, 'select * from routenameswithdistrict');
   $select3 = array();
   foreach ($result->data as $row){
@@ -660,18 +664,18 @@
   $routename = $row[0];
   $district = $row[3];
   $select3[$district][$roadname][$routename]=$routename;
-  
+
   }
-  $hierselect->setOptions(array($select1, $select2,$select3));    
-    //echo "<pre>"; 
-    
-    //echo "</pre>"; 
-    //$hierselect->setOptions($select); 
-    /* init the hierselect with the values from the database */ 
-    
-    /* we are done! */ 
-    $this->fb_preDefElements[$virtualfield] = $hierselect; 
-  
+  $hierselect->setOptions(array($select1, $select2,$select3));
+    //echo "<pre>";
+
+    //echo "</pre>";
+    //$hierselect->setOptions($select);
+    /* init the hierselect with the values from the database */
+
+    /* we are done! */
+    $this->fb_preDefElements[$virtualfield] = $hierselect;
+
   }
   $arrpanelcatagory=array(1=>_('Contract'),3=>_('Private'),2=>_('Goverment'));
   $sattrs = array('onchange' =>
@@ -681,97 +685,97 @@
   $this->fb_preDefElements['panelcatagory'] = HTML_QuickForm::createElement(
   'select', 'panelcatagory', _('Panel catagory'),$arrpanelcatagory,$sattrs);
   $arryesno=array(1=>_('Yes'),2=>_('No'));
-  
+
   $attrs = array('onchange' =>
   "javascript:setface(this.options[this.selectedIndex].value);",'onblur' =>
   "javascript:setface(this.options[this.selectedIndex].value);",'onclick' =>
   "javascript:setface(this.options[this.selectedIndex].value);");
   $this->fb_preDefElements['medianwidth'] = HTML_QuickForm::createElement(
-  'select', 'medianwidth', _('Median available'),$arryesno,$attrs); 
+  'select', 'medianwidth', _('Median available'),$arryesno,$attrs);
   $this->fb_preDefElements['image'] = HTML_QuickForm::createElement(
-  'file', 'image', _('Panel image'),null,'client'); 
- 
-  
+  'file', 'image', _('Panel image'),null,'client');
+
+
     if ($_REQUEST['type']=="old"){
      $this->fb_preDefElements['panelarea']=HTML_QuickForm::createElement(
   'text', 'panelarea', _('Panel Area:'));
   $this->fb_preDefElements['usefees']=HTML_QuickForm::createElement(
-  'text', 'usefees', _('Use...
 
[truncated message content]

Thread: [Rapc-commit] SF.net SVN: rapc: [51] trunk/rapc (Page 2)

rapc-commit