Changeset 1424

Timestamp:

Sep 26, 2010, 11:42:00 AM (10 years ago)

Author:

roux

Message:

ajouts solr

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/parlementaire/templates/showSuccess.php (modified) (1 diff)
• config/doctrine/schema.yml (modified) (2 diffs)
• lib/model/doctrine/Citoyen.class.php (modified) (1 diff)
• lib/model/doctrine/Organisme.class.php (modified) (3 diffs)
• lib/model/doctrine/Section.class.php (modified) (2 diffs)

cpc/trunk/project/apps/frontend/modules/parlementaire/templates/showSuccess.php

@@ -45 +45 @@
       <h2>Responsabilités</h2>
       <ul>
-        <li>Commission permanente : <?php foreach ($resps as $resp) if (in_array($resp->organisme_id, array(2, 11, 13, 22, 204, 211, 212, 237))) { echo link_to(ucfirst(str_replace('Commission des ', '', $resp->getNom())), '@list_parlementaires_organisme?slug='.$resp->getSlug()); echo ' ('.$resp->getFonction().') '; break; } ?></li>
+        <li>Commission permanente : <?php foreach ($resps as $resp) if (in_array($resp->organisme_id, array(2, 11, 13, 22, 204, 211, 212, 237))) { echo link_to(ucfirst(str_replace('Commission des ', '', str_replace(' et de l\'', ' et ', $resp->getNom()))), '@list_parlementaires_organisme?slug='.$resp->getSlug()); echo ' ('.$resp->getFonction().') '; break; } ?></li>
         <li>Missions parlementaires :
           <ul>

cpc/trunk/project/config/doctrine/schema.yml

@@ -27 +27 @@
       extra_weight: 1.5
       description: [villes]
-      moretags: [profession, nom_circo]
+      moretags: [Organismes, profession, nom_circo]
   columns:
     nom_circo: string(255)
@@ -75 +75 @@
       fields: [nom]
       unique: true
+    Solrable:
+      title: [titre]
+      extra_weight: 1.1
+      moretags: [type]
+      index_if: is_to_index
   columns:
     nom: 

cpc/trunk/project/lib/model/doctrine/Citoyen.class.php

@@ -6 +6 @@
 class Citoyen extends BaseCitoyen
 {
+  public function getLink() {
+    sfProjectConfiguration::getActive()->loadHelpers(array('Url'));
+    return url_for('@citoyen?slug='.$this->slug);
+  }
+  public function getTitre() {
+    return $this->getLogin();
+  }
+  public function getPersonne() {
+    return '';
+  }
   public function __toString() {
     return $this->getLogin();

cpc/trunk/project/lib/model/doctrine/Organisme.class.php

@@ -8 +8 @@
 class Organisme extends BaseOrganisme
 {
+  public function getLink() {
+    sfProjectConfiguration::getActive()->loadHelpers(array('Url'));
+    return url_for('@list_parlementaires_organisme?slug='.$this->slug);
+  }
+  public function getTitre() {
+    if ($this->type === "groupe")
+      return $this->getNom().' ('.$this->getSmallNomGroupe().')';
+    else return $this->getNom();
+  }
+  public function getPersonne() {
+    return '';
+  }
   public function __tostring() {
-    return substr($this->nom, 0, 100);
+    return substr($this->getTitre(), 0, 100);
   }
   public function getSmallNomGroupe() {
@@ -19 +31 @@
         "Nouveau centre" => "NC"
     );
-    return $hashmap[$this->getNom()];
+    if (isset($hashmap[$this->getNom()]))
+      return $hashmap[$this->getNom()];
+    return "";
   }
 
@@ -87 +101 @@
     return $res;
   }
+
+  public function getIsToIndex() {
+    if ($this->type === "extra")
+      return false;
+    return true;
+  }
 }

cpc/trunk/project/lib/model/doctrine/Section.class.php

@@ -6 +6 @@
 class Section extends BaseSection
 {
+  public function getLink() {
+    sfProjectConfiguration::getActive()->loadHelpers(array('Url'));
+    return url_for('@section?id='.$this->id);
+  }
+  public function getPersonne() {
+    return '';
+  }
+  public function __tostring() {
+    if ($str = $this->_get('titre_complet'))
+      return $str;
+    return "";
+  }
+
   public function setTitreComplet($titre) {
     $this->_set('titre_complet', $titre);
@@ -70 +83 @@
   }
 
-  public function isParent() {
+  public function getIsParent() {
     if ($this->section_id == $this->id && !preg_match('/questions/i', $this->titre))
       return true;