Changeset 483

Timestamp:

12/02/08 10:20:13 (1 month ago)

Author:

nicolas

Message:

Mise à jour lib

Files:

• trunk/config/schema.xml (modified) (3 diffs)
• trunk/data/sql/lib.model.schema.sql (modified) (9 diffs)
• trunk/lib/form/Service_detail_i18nForm.class.php (added)
• trunk/lib/form/base/BaseLeaseForm.class.php (modified) (2 diffs)
• trunk/lib/form/base/BaseParamsForm.class.php (modified) (1 diff)
• trunk/lib/form/base/BaseRentForm.class.php (modified) (1 diff)
• trunk/lib/form/base/BaseService_detailForm.class.php (modified) (2 diffs)
• trunk/lib/form/base/BaseService_detail_i18nForm.class.php (added)
• trunk/lib/form/base/BaseTemplate_lineForm.class.php (modified) (1 diff)
• trunk/lib/model/Contact.php (modified) (1 diff)
• trunk/lib/model/Estate_typeold.php (modified) (1 diff)
• trunk/lib/model/Lease.php (modified) (2 diffs)
• trunk/lib/model/Service_detail.php (modified) (1 diff)
• trunk/lib/model/Service_detail_i18n.php (added)
• trunk/lib/model/Service_detail_i18nPeer.php (added)
• trunk/lib/model/SignaturePeer.php (modified) (1 diff)
• trunk/lib/model/map/LeaseMapBuilder.php (modified) (1 diff)
• trunk/lib/model/map/RentMapBuilder.php (modified) (1 diff)
• trunk/lib/model/map/Service_detailMapBuilder.php (modified) (1 diff)
• trunk/lib/model/map/Service_detail_i18nMapBuilder.php (added)
• trunk/lib/model/map/Template_lineMapBuilder.php (modified) (1 diff)
• trunk/lib/model/om/BaseAgency.php (modified) (6 diffs)
• trunk/lib/model/om/BaseBrand.php (modified) (5 diffs)
• trunk/lib/model/om/BaseCompany.php (modified) (5 diffs)
• trunk/lib/model/om/BaseLease.php (modified) (11 diffs)
• trunk/lib/model/om/BaseLeasePeer.php (modified) (4 diffs)
• trunk/lib/model/om/BaseRent.php (modified) (2 diffs)
• trunk/lib/model/om/BaseService.php (modified) (1 diff)
• trunk/lib/model/om/BaseService_detail.php (modified) (16 diffs)
• trunk/lib/model/om/BaseService_detailPeer.php (modified) (5 diffs)
• trunk/lib/model/om/BaseService_detail_i18n.php (added)
• trunk/lib/model/om/BaseService_detail_i18nPeer.php (added)
• trunk/lib/model/om/BaseUser.php (modified) (5 diffs)

trunk/config/schema.xml

@@ -1155 +1155 @@
-  
-  <table name="lease" phpName="Lease">
-primaryKey="true"  required="true" name="id" type="integer
-
-name="agency_id"
+required="true"  name="id" type="integer" primaryKey="true
+             
+ name="agency_id"              
-    <foreign-key foreignTable="agency">
-      <reference local="agency_id" foreign="id"/>
-    </foreign-key>
-
+              
-    <foreign-key foreignTable="contact">
-      <reference local="lessee_id" foreign="id"/>
-    </foreign-key>
-
+              
-    <foreign-key foreignTable="contact">
-      <reference local="lessor_id" foreign="id"/>
-    </foreign-key>
-
+                 
-    <foreign-key foreignTable="rent">
-      <reference local="rent_id" foreign="id"/>
-    </foreign-key>
-
+               
-    <foreign-key foreignTable="estate">
-      <reference local="estate_id" foreign="id"/>
-    </foreign-key>
-
+                 
-    <foreign-key foreignTable="lease_step">
-      <reference local="step_id" foreign="id"/>
-    </foreign-key>
-
+                
-    <foreign-key foreignTable="lease_type">
-      <reference local="type_id" foreign="id"/>
-    </foreign-key>
-
+      
-    <foreign-key foreignTable="lease_guarantee_type">
-      <reference local="guarantee_type_id" foreign="id"/>
-    </foreign-key>
-
-
-
-
-
+      
+               
+                 
+            
+      
-    <column required="true"  name="provisions_to_lessor_is" type="boolean" default="0"/>
-
-
-
-
-
+
+
+
+
+
+
+
-    <foreign-key foreignTable="lease_commission_type">
-      <reference local="commission_type_id" foreign="id"/>
-    </foreign-key>
-default="1" type="integer
+      type="integer" default="1
-    <foreign-key foreignTable="lease_commission_vat">
-      <reference local="commission_vat_id" foreign="id"/>
-    </foreign-key>
-
-
-
-
-
-
-
-
-
-
-
+                  
+             
+
+
+
+             
+             
+
+
+
+             
-  </table>
-
@@ -1892 +1894 @@
-      <reference local="updated_by" foreign="id"/>
-    </foreign-key>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </table>
-
@@ -2564 +2575 @@
-  </table>
-
-sector" phpName="S
-                   name="id"
-                   name="agency_id"
+market_sector" phpName="Market_s
+name="id"                 
+name="agency_id"                 
-    <foreign-key foreignTable="agency">
-      <reference local="agency_id" foreign="id"/>
-    </foreign-key>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    <foreign-key foreignTable="agency">
-      <reference local="agency_id" foreign="id"/>
-    </foreign-key>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </table>
-
-  <table name="zone_sector" phpName="Zone_sector">
-                   name="id"
-                   name="zone_id"
+name="id"                 
+name="zone_id"                 
-    <foreign-key foreignTable="zone">
-      <reference local="zone_id" foreign="id"/>
-    </foreign-key>
-                   name="sector_id"
+name="sector_id"                 
-    <foreign-key foreignTable="sector">
-      <reference local="sector_id" foreign="id"/>
-    </foreign-key>
-                   name="created_by"
-
-
-
-                   name="created_at"
-                   name="updated_by"
-
-
-
-                   name="updated_at"
+name="created_by"                 
+
+
+
+name="created_at"                 
+name="updated_by"                 
+
+
+
+name="updated_at"                 
-  </table>
-

trunk/data/sql/lib.model.schema.sql

@@ -1874 +1874 @@
-        `vit_2` TEXT,
-        `vit_3` VARCHAR(100),
-INTEGER(11
+VARCHAR(20
-        `transfert_name` VARCHAR(255),
-        `created_by` INTEGER(11),
@@ -1983 +1983 @@
-        `insurance_is` INTEGER default 0 NOT NULL,
-        `insurance_rate` DECIMAL(10,2) default 0,
+        `insurance_callback_at` DATE,
+        `chaudiere_callback_at` DATE,
-        `commission_rate` DECIMAL(10,3) default 0,
-        `commission_type_id` INTEGER(11),
@@ -3178 +3180 @@
-(
-        `id` INTEGER  NOT NULL AUTO_INCREMENT,
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-)Type=MyISAM;
-
@@ -3568 +3588 @@
-(
-        `id` INTEGER  NOT NULL AUTO_INCREMENT,
+        `brand_id` INTEGER(11),
+        `company_id` INTEGER(11),
-        `agency_id` INTEGER(11),
-        `name` VARCHAR(30),
-        `param` VARCHAR(120),
-        PRIMARY KEY (`id`),
-agency
+brand
-        CONSTRAINT `params_FK_1`
+                FOREIGN KEY (`brand_id`)
+                REFERENCES `brand` (`id`),
+        INDEX `params_FI_2` (`company_id`),
+        CONSTRAINT `params_FK_2`
+                FOREIGN KEY (`company_id`)
+                REFERENCES `company` (`id`),
+        INDEX `params_FI_3` (`agency_id`),
+        CONSTRAINT `params_FK_3`
-                FOREIGN KEY (`agency_id`)
-                REFERENCES `agency` (`id`)
@@ -3939 +3969 @@
-        `type_id` INTEGER(11)  NOT NULL,
-        `name` VARCHAR(50)  NOT NULL,
-5
+10
-        `picture` VARCHAR(1),
-        `start_from_last` INTEGER default 0 NOT NULL,
@@ -4085 +4115 @@
-        `agency` VARCHAR(100),
-        `agency_city` VARCHAR(100),
+        `agency_agent` VARCHAR(100),
+        `agency_phone` VARCHAR(100),
+        `agency_mail` VARCHAR(100),
-        `nature_id` INTEGER(11)  NOT NULL,
-        `type_id` INTEGER(11)  NOT NULL,
@@ -4128 +4161 @@
-        `building` VARCHAR(100),
-        `sector` VARCHAR(100),
+        `district_id` INTEGER(11),
-        `address1` VARCHAR(100),
-        `address2` VARCHAR(100),
@@ -4159 +4193 @@
-        `building_permit` INTEGER default 0,
-        `url` VARCHAR(160),
+        `last_change` DATE,
-        `created_at` DATETIME,
-        `updated_at` DATETIME,
@@ -4173 +4208 @@
-        CONSTRAINT `market_FK_3`
-                FOREIGN KEY (`type_id`)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-)Type=MyISAM;
-

trunk/lib/form/base/BaseLeaseForm.class.php

@@ -32 +32 @@
-      'insurance_is'            => new sfWidgetFormInputCheckbox(),
-      'insurance_rate'          => new sfWidgetFormInput(),
+      'insurance_callback_at'   => new sfWidgetFormDate(),
+      'chaudiere_callback_at'   => new sfWidgetFormDate(),
-      'commission_rate'         => new sfWidgetFormInput(),
-      'commission_type_id'      => new sfWidgetFormPropelSelect(array('model' => 'Lease_commission_type', 'add_empty' => true)),
@@ -62 +64 @@
-      'insurance_is'            => new sfValidatorBoolean(),
-      'insurance_rate'          => new sfValidatorNumber(array('required' => false)),
+      'insurance_callback_at'   => new sfValidatorDate(array('required' => false)),
+      'chaudiere_callback_at'   => new sfValidatorDate(array('required' => false)),
-      'commission_rate'         => new sfValidatorNumber(array('required' => false)),
-      'commission_type_id'      => new sfValidatorPropelChoice(array('model' => 'Lease_commission_type', 'column' => 'id', 'required' => false)),

trunk/lib/form/base/BaseParamsForm.class.php

@@ -13 +13 @@
-  {
-    $this->setWidgets(array(
-
-
-
-
+
+
+
+
+
+
-    ));
-
-    $this->setValidators(array(
-
-
-
-
+
+
+
+
+
+
-    ));
-

trunk/lib/form/base/BaseRentForm.class.php

@@ -72 +72 @@
-      'vit_2'               => new sfValidatorString(array('required' => false)),
-      'vit_3'               => new sfValidatorString(array('max_length' => 100, 'required' => false)),
-Integer(array(
+String(array('max_length' => 20, 
-      'transfert_name'      => new sfValidatorString(array('max_length' => 255, 'required' => false)),
-      'created_by'          => new sfValidatorPropelChoice(array('model' => 'User', 'column' => 'id', 'required' => false)),

trunk/lib/form/base/BaseService_detailForm.class.php

@@ -13 +13 @@
-  {
-    $this->setWidgets(array(
-
-
+
-    ));
-
-    $this->setValidators(array(
-
-
+
-    ));
-
@@ -34 +32 @@
-  }
-
+  public function getI18nModelName()
+  {
+    return 'Service_detail_i18n';
+  }
+
+  public function getI18nFormClass()
+  {
+    return 'Service_detail_i18nForm';
+  }
-
-}

trunk/lib/form/base/BaseTemplate_lineForm.class.php

@@ -46 +46 @@
-      'type_id'         => new sfValidatorPropelChoice(array('model' => 'Template_line_type', 'column' => 'id')),
-      'name'            => new sfValidatorString(array('max_length' => 50)),
-5
+10
-      'picture'         => new sfValidatorString(array('max_length' => 1, 'required' => false)),
-      'start_from_last' => new sfValidatorBoolean(),

trunk/lib/model/Contact.php

@@ -232 +232 @@
-    return RentPeer::doCount($c);
-  }
+
+  public function getTelFirst()
+  {
+    if($this->tel):
+      return ereg_replace("([0-9]{2})", "\\0 ", $this->tel);
+    else:
+      return ereg_replace("([0-9]{2})", "\\0 ", $this->mobile);
+    endif;
+  }
-} // Contact

trunk/lib/model/Estate_typeold.php

@@ -1 +1 @@
-<?php
-
-require_once 'lib/model/om/BaseEstate_typeold.php';
-
-
-/**
- * Skeleton subclass for representing a row from the 'estate_typeold' table.

trunk/lib/model/Lease.php

@@ -31 +31 @@
-  {
-    if($this->getCommissionTypeId()==1)
-$this->getPrice(
+($this->getAmountRent()+$this->getAmountProvisions()
-    else
-    return $this->getAmountRent()/100*$this->getCommissionRate();
@@ -43 +43 @@
-  public function getInsurance()
-  {
-$this->getAmountRent(
+($this->getAmountRent()+$this->getAmountProvisions()
-  }
-  

trunk/lib/model/Service_detail.php

@@ -10 +10 @@
-class Service_detail extends BaseService_detail
-{
-
+
+
+
+
+
+
+
-  {
-    return $this->getName();

trunk/lib/model/SignaturePeer.php

@@ -82 +82 @@
-    return $data_tmp;
-  }
+
+  public static function getUserGroupByDate($start , $end , $agency_id = false, $step_id = false)
+  {
+    $c = new Criteria();
+    if($step_id == 4):
+      if($start && $end):
+        $criterion = $c->getNewCriterion(SignaturePeer::NOTARY_SIGN_AT, $start, Criteria::GREATER_EQUAL);
+        $criterion->addAnd($c->getNewCriterion(SignaturePeer::NOTARY_SIGN_AT, $end, Criteria::LESS_EQUAL));
+        $c->add($criterion);
+      endif;
+    else:
+      if($start && $end):
+        $criterion = $c->getNewCriterion(SignaturePeer::NOTARY_PROGRAM_AT, $start, Criteria::GREATER_EQUAL);
+        $criterion->addAnd($c->getNewCriterion(SignaturePeer::NOTARY_PROGRAM_AT, $end, Criteria::LESS_EQUAL));
+        $c->add($criterion);
+      endif;
+    endif;
+    $c->add($criterion);
+    if($agency_id)
+      $c->add(SignaturePeer::AGENCY_ID , $agency_id , Criteria::IN);
+    $c->addGroupByColumn(SignaturePeer::USER_ID);
+    $c->addJoin(SignaturePeer::USER_ID , UserPeer::ID, Criteria::INNER_JOIN);
+    
+    return SignaturePeer::doSelect($c);
+  }
-}

trunk/lib/model/map/LeaseMapBuilder.php

@@ -71 +71 @@
-                $tMap->addColumn('INSURANCE_RATE', 'InsuranceRate', 'double', CreoleTypes::DECIMAL, false, 10);
-
+                $tMap->addColumn('INSURANCE_CALLBACK_AT', 'InsuranceCallbackAt', 'int', CreoleTypes::DATE, false, null);
+
+                $tMap->addColumn('CHAUDIERE_CALLBACK_AT', 'ChaudiereCallbackAt', 'int', CreoleTypes::DATE, false, null);
+
-                $tMap->addColumn('COMMISSION_RATE', 'CommissionRate', 'double', CreoleTypes::DECIMAL, false, 10);
-

trunk/lib/model/map/RentMapBuilder.php

@@ -83 +83 @@
-                $tMap->addColumn('VIT_3', 'Vit3', 'string', CreoleTypes::VARCHAR, false, 100);
-
-int', CreoleTypes::INTEGER, false, 11
+string', CreoleTypes::VARCHAR, false, 20
-
-                $tMap->addColumn('TRANSFERT_NAME', 'TransfertName', 'string', CreoleTypes::VARCHAR, false, 255);

trunk/lib/model/map/Service_detailMapBuilder.php

@@ -35 +35 @@
-                $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, null);
-
-                $tMap->addColumn('NAME', 'Name', 'string', CreoleTypes::VARCHAR, false, 100);
-
-        } 
-} 

trunk/lib/model/map/Template_lineMapBuilder.php

@@ -43 +43 @@
-                $tMap->addColumn('NAME', 'Name', 'string', CreoleTypes::VARCHAR, true, 50);
-
-5
+10
-
-                $tMap->addColumn('PICTURE', 'Picture', 'string', CreoleTypes::VARCHAR, false, 1);

trunk/lib/model/om/BaseAgency.php

@@ -311 +311 @@
-        
-        protected $lastTemplateCriteria = null;
+
+        
+        protected $collMarket_sectors;
+
+        
+        protected $lastMarket_sectorCriteria = null;
-
-        
@@ -1602 +1608 @@
-                        }
-
+                        if ($this->collMarket_sectors !== null) {
+                                foreach($this->collMarket_sectors as $referrerFK) {
+                                        if (!$referrerFK->isDeleted()) {
+                                                $affectedRows += $referrerFK->save($con);
+                                        }
+                                }
+                        }
+
-                        if ($this->collSectors !== null) {
-                                foreach($this->collSectors as $referrerFK) {
@@ -1915 +1929 @@
-                                if ($this->collTemplates !== null) {
-                                        foreach($this->collTemplates as $referrerFK) {
+                                                if (!$referrerFK->validate($columns)) {
+                                                        $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures());
+                                                }
+                                        }
+                                }
+
+                                if ($this->collMarket_sectors !== null) {
+                                        foreach($this->collMarket_sectors as $referrerFK) {
-                                                if (!$referrerFK->validate($columns)) {
-                                                        $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures());
@@ -2565 +2587 @@
-                        }
-
+                        foreach($this->getMarket_sectors() as $relObj) {
+                                $copyObj->addMarket_sector($relObj->copy($deepCopy));
+                        }
+
-                        foreach($this->getSectors() as $relObj) {
-                                $copyObj->addSector($relObj->copy($deepCopy));
@@ -9682 +9708 @@
-        }
-
+
+        
+        public function getParamssJoinBrand($criteria = null, $con = null)
+        {
+                                if ($criteria === null) {
+                        $criteria = new Criteria();
+                }
+                elseif ($criteria instanceof Criteria)
+                {
+                        $criteria = clone $criteria;
+                }
+
+                if ($this->collParamss === null) {
+                        if ($this->isNew()) {
+                                $this->collParamss = array();
+                        } else {
+
+                                $criteria->add(ParamsPeer::AGENCY_ID, $this->getId());
+
+                                $this->collParamss = ParamsPeer::doSelectJoinBrand($criteria, $con);
+                        }
+                } else {
+                                                                        
+                        $criteria->add(ParamsPeer::AGENCY_ID, $this->getId());
+
+                        if (!isset($this->lastParamsCriteria) || !$this->lastParamsCriteria->equals($criteria)) {
+                                $this->collParamss = ParamsPeer::doSelectJoinBrand($criteria, $con);
+                        }
+                }
+                $this->lastParamsCriteria = $criteria;
+
+                return $this->collParamss;
+        }
+
+
+        
+        public function getParamssJoinCompany($criteria = null, $con = null)
+        {
+                                if ($criteria === null) {
+                        $criteria = new Criteria();
+                }
+                elseif ($criteria instanceof Criteria)
+                {
+                        $criteria = clone $criteria;
+                }
+
+                if ($this->collParamss === null) {
+                        if ($this->isNew()) {