Changeset 2674 for cpc/trunk/project

Timestamp:

May 12, 2012, 8:39:25 PM (9 years ago)

Author:

teymour

Message:

Ajout d'un champ pour les amendements multiples (+correction bug rectifié)

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/amendement/actions/actions.class.php (modified) (1 diff)
• bin/updateDB5.sh (modified) (1 diff)
• config/doctrine/schema.yml (modified) (1 diff)
• lib/model/doctrine/Amendement.class.php (modified) (1 diff)
• lib/task/loadAmdmtsTask.class.php (modified) (1 diff)

cpc/trunk/project/apps/frontend/modules/amendement/actions/actions.class.php

@@ -41 +41 @@
        ->from('Amendement a')
        ->where('a.sous_amendement_de = ?', $this->amendement->numero)
+       ->andWhere('a.sort <> ?', 'Rectifié')
        ->orderBy('a.numero')
        ->fetchArray();

cpc/trunk/project/bin/updateDB5.sh

@@ -1 +1 @@
 . bin/db.inc
+
 echo 'ALTER TABLE amendement ADD sous_amendement_de VARCHAR(8) NOT NULL AFTER numero' | mysql $MYSQLID $DBNAME
 echo 'select a.id, a.texteloi_id, a.numero, t.triple_value from amendement a, tagging tg, tag t WHERE a.sort <> "Rectifié" and a.id = tg.taggable_id AND t.id = tg.tag_id AND t.triple_key = "sous_amendement_de"' |  mysql $MYSQLID $DBNAME | grep ^[0-9] | sed 's/\([A-F]\)\t/;\1;/'| sed 's/\t/;;/g' | awk -F';' '{print $1";"$3";"$5$6";"$7$6}'|awk -F';' '{print "update amendement set sous_amendement_de = \""$4"\" where id = "$1";"}' | mysql $MYSQLID $DBNAME
+
+echo 'ALTER TABLE amendement ADD nb_multiples INT NOT NULL DEFAULT 1 AFTER content_md5 ' | mysql $MYSQLID $DBNAME
+echo 'select a.id, count(tg.id) FROM tagging tg LEFT JOIN amendement a ON a.id = tg.taggable_id LEFT JOIN tag t ON t.id = tg.tag_id  WHERE a.sort <> "Rectifié" AND t.triple_key = "amendement" AND taggable_model = "Amendement" group by a.id' |  mysql $MYSQLID $DBNAME | grep ^[0-9]  | awk '{print "UPDATE amendement SET nb_multiples = "$2" WHERE id = "$1";"}'  | mysql $MYSQLID $DBNAME
+
 php symfony doctrine:build-model

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

@@ -282 +282 @@
       type: string
     content_md5: string(36)
+    nb_multiples: 
+      type: integer
+      default: 1
   relations:
     Parlementaires:

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

@@ -126 +126 @@
     $numeros = $this->numero;
     $lettre = $this->getLettreLoi();
-    $ident = $this->getTags(array('is_triple' => true,
+    if ($this->nb_multiples > 1) {
+      $ident = $this->getTags(array('is_triple' => true,
           'namespace' => 'loi',
           'key' => 'amendement',
           'return'    => 'value'));
-    if (count($ident) > 1 && $lettre != "") {
       sort($ident);
-      if ($lettre) foreach ($ident as $iden) $iden .= $lettre;
+      foreach ($ident as $iden) if (preg_match('/'.$lettre.'/', $iden)) $iden.= $lettre;
       $numeros = implode(', ', $ident);
       $pluriel = "s";

cpc/trunk/project/lib/task/loadAmdmtsTask.class.php

@@ -59 +59 @@
               $lettre = $amdmt->getLettreLoi();
               if ($json->serie) {
+                $nb_serie = 0;
                 if (preg_match('/,/', $json->serie)) {
                   $arr = preg_split('/,/', $json->serie);
                   foreach ($arr as $gap_stri) {
                     $gap = preg_split('/-/', $gap_stri);
-                    for ($n = $gap[0]; $n <= $gap[1]; $n++) 
+                    for ($n = $gap[0]; $n <= $gap[1]; $n++) {
                       $amdmt->addTag('loi:amendement='.$n.$lettre);
+                      $nb_serie++;
+                    }
                   }
                 } else {
                   $gap = preg_split('/-/', $json->serie);
-                  for ($n = $gap[0]; $n <= $gap[1]; $n++)
+                  for ($n = $gap[0]; $n <= $gap[1]; $n++) {
                     $amdmt->addTag('loi:amendement='.$n.$lettre);
+                    $nb_serie++;
+                  }
                 }
-              } else $amdmt->addTag('loi:amendement='.$amdmt->numero);
+                $amdmt->nb_multiples = $nb_serie;
+              } else {
+                $amdmt->addTag('loi:amendement='.$amdmt->numero);
+                $amdmt->nb_multiples = 1;
+              }
               if ($json->parent)
                 $amdmt->sous_amendement_de = $json->parent.$lettre;