adding secondaryType of structures

src/ClassCodeBundle/Command/ImportStructuresFromJsonCommand.php

@@ -78,6 +78,11 @@ class ImportStructuresFromJsonCommand extends ContainerAwareCommand
             }else{
               $logo ="";
             }
+            if($data_structure['structureType']){
+              $secondaryType = ltrim(rtrim($data_structure['structureType']));  
+            }else{
+              $secondaryType ="";
+            }
             if($data_structure['url']){
               $url = ltrim(rtrim($data_structure['url']));  
             }else{
@@ -120,6 +125,7 @@ class ImportStructuresFromJsonCommand extends ContainerAwareCommand
               $structure->setMainType($type);
             }
             if(($structure->getLogo() != $logo)||
+               ($structure->getSecondaryType() != $secondaryType)||
                ($structure->getUrl() != $url)||
                ($structure->getWho()!=$who)||
                ($structure->getAddress() != $address)||
@@ -129,6 +135,7 @@ class ImportStructuresFromJsonCommand extends ContainerAwareCommand
                ($structure->getEmail() != $email)){
                  
               $structure->setLogo($logo); 
+              $structure->setSecondaryType($secondaryType);
               $structure->setUrl($url); 
               $structure->setWho($who); 
               $structure->setEmail($email); 

src/ClassCodeBundle/Controller/StructureController.php

@@ -36,11 +36,19 @@ class StructureController extends Controller
   {
     $em = $this->getDoctrine()->getManager();
     $type = $request->query->get('type');
-    if(!$type){
+    $secondaryType = $request->query->get('secondaryType');
+    $queryArray = array();
+    if($type){
+      $queryArray['mainType'] = $type;
+    }
+    if($secondaryType){
+      $queryArray['secondaryType'] = $secondaryType;
+    }
+    if(sizeof($queryArray) == 0){
       $structures =  $em->getRepository('ClassCodeBundle:Structure')->findAll();  
     }else{      
       $structures =  $em->getRepository('ClassCodeBundle:Structure')->findby(
-        array('mainType' => $type)
+        $queryArray
       );
     }
   

src/ClassCodeBundle/Entity/Structure.php

@@ -104,6 +104,13 @@ class Structure
      */
     private $mainType = 'Partenaire ClassCode';
     
+    /**
+     * @var string $secondaryType
+     *
+     * @ORM\Column(name="secondaryType", type="string", length=255, nullable=true)
+     */
+    private $secondaryType ;
+    
     /**
      * @var string $dataSource
      *
@@ -339,7 +346,30 @@ class Structure
     {
         return $this->mainType;
     }
+
+    /**
+     * Set secondaryType
+     *
+     * @param string $secondaryType
+     * @return Structure
+     */
+    public function setSecondaryType($secondaryType)
+    {
+        $this->secondaryType = $secondaryType;
     
+        return $this;
+    }
+
+    /**
+     * Get secondaryType
+     *
+     * @return string 
+     */
+    public function getSecondaryType()
+    {
+        return $this->secondaryType;
+    }
+        
     /**
      * Set dataSource
      *