dev #35088 refacto profilte prefs fix patron fields in db

cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php

@@ -734,4 +734,68 @@ class Cosmo_DataProfileControllerEditPergamePatronsTest extends Cosmo_DataProfil
   public function inputSubscribersLightShouldContainsFieldsIDABON_ORDREABON_etc() {
     $this->assertXPath('//input[@name="patron_fields"][@value="IDABON;ORDREABON;NOM;PRENOM;NAISSANCE;DATE_DEBUT;DATE_FIN;MAIL"]');
   }
+}
+
+
+
+
+class Cosmo_DataProfileControllerEditNanookPatronsRegressionTest extends Cosmo_DataProfileControllerTestCase {
+  public function setUp() {
+    parent::setUp();
+
+    $this->fixture('Class_CosmoVar',
+                   ['id' => 'champs_abonne',
+                    'valeur' => null,
+                    'liste' => " IDABON:id abonné (n° de carte)\r\n ORDREABON:n° d'ordre dans la famille\r\n NOM:nom\r\n PRENOM:prénom\r\n NAISSANCE:date de naissance\r\n PASSWORD:mot de passe\r\n MAIL:adresse e-mail\r\n DATE_DEBUT:date début abonnement\r\n DATE_FIN:date fin abonnement\r\n NULL:ignorer ce champ"]);
+
+    $this->fixture('Class_IntProfilDonnees',
+                   [
+                    'id' => 59,
+                    'libelle' => 'Nanook patrons',
+                    'accents' => Class_IntProfilDonnees::ENCODING_UTF8,
+                    'rejet_periodiques' => 1,
+                    'id_article_periodique' => Class_IntProfilDonnees::SERIAL_FORMAT_NONE,
+                    'type_fichier' => Class_IntProfilDonnees::FT_PATRONS,
+                    'format' => Class_IntProfilDonnees::FORMAT_CSV,
+                    'attributs' =>
+                    [ 0 => [Class_IntProfilDonnees::FIELD_TYPE_DOC_RECOGNITION => [ ],
+                       Class_IntProfilDonnees::FIELD_ITEM_BARCODE => '996',
+                       Class_IntProfilDonnees::FIELD_ITEM_GENRE => '',
+                       Class_IntProfilDonnees::FIELD_ITEM_SECTION => 'x',
+                       Class_IntProfilDonnees::FIELD_ITEM_EMPLACEMENT => '',
+                       Class_IntProfilDonnees::FIELD_ITEM_ANNEXE => 'a'
+                     ],
+                     1 => ['champs' => 'IDABON;ID_SIGB;ORDREABON;NOM;PRENOM;PASSWORD;MAIL'],
+                     2 => ['champs' => 'IDABON;ID_SIGB;ORDREABON;NOM;PRENOM;PASSWORD;MAIL'],
+                     3 => ['champs' => 'IDABON;ID_SIGB;ORDREABON;NOM;PRENOM;PASSWORD;MAIL'],
+                     4 => ['zone' => '', 'champ' => '', 'format' => '', 'jours' => '', 'valeurs' => ''],
+                     5 => ['xml_balise_abonne' => '',
+                           'xml_champs_abonne' => [
+                                                   'IDABON' => '',
+                                                   'ORDREABON' => '',
+                                                   'NOM' => '',
+                                                   'PRENOM' => '',
+                                                   'NAISSANCE' => '',
+                                                   'PASSWORD' => '',
+                                                   'MAIL' => '',
+                                                   'DATE_DEBUT' => '',
+                                                   'DATE_FIN' => '',
+                                                   'ID_SIGB' => '']]
+                    ]]);
+
+    $this->dispatch('cosmo/data-profile/edit/id/59', true);
+  }
+
+
+  /** @test */
+  public function inputPatronFieldsShouldContainsIDABON_ID_SIGB_etc() {
+    $this->assertXPath('//input[@name="patron_fields"][@value="IDABON;ID_SIGB;ORDREABON;NOM;PRENOM;PASSWORD;MAIL"]', $this->_response->getBody());
+  }
+
+
+  /** @test */
+  public function paragraphForPatronFieldsShouldContainsDateDeNaissance() {
+    $this->assertXPath('//div[@id="input_patron_fields"]/div[1]/ul/li[@data-value="PRENOM"]',
+                       $this->_response->getBody());
+  }
 }
\ No newline at end of file

library/Class/CosmoVar.php

@@ -68,7 +68,7 @@ class Class_CosmoVarLoader extends Storm_Model_Loader {
     $values = array_filter(explode(chr(13).chr(10), $model->getListe()));
     foreach ($values as $value) {
       $parts = explode(':', $value);
-      $result[$parts[0]] = $parts[1];
+      $result[trim($parts[0])] = trim($parts[1]);
     }
     return $result;
   }