From 5bd39c38f8193a70938d3da26810afc898ab5233 Mon Sep 17 00:00:00 2001
From: Ninassi Benjamin <benjamin.ninassi@inria.fr>
Date: Mon, 15 Apr 2019 18:38:03 +0200
Subject: [PATCH] adding secondaryType of structures
---
.../ImportStructuresFromJsonCommand.php | 7 +++++
.../Controller/StructureController.php | 12 ++++++--
src/ClassCodeBundle/Entity/Structure.php | 30 +++++++++++++++++++
3 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/src/ClassCodeBundle/Command/ImportStructuresFromJsonCommand.php b/src/ClassCodeBundle/Command/ImportStructuresFromJsonCommand.php
index 99c47c2..9b007e2 100644
--- a/src/ClassCodeBundle/Command/ImportStructuresFromJsonCommand.php
+++ b/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);
diff --git a/src/ClassCodeBundle/Controller/StructureController.php b/src/ClassCodeBundle/Controller/StructureController.php
index d875cf6..8441920 100644
--- a/src/ClassCodeBundle/Controller/StructureController.php
+++ b/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
);
}
diff --git a/src/ClassCodeBundle/Entity/Structure.php b/src/ClassCodeBundle/Entity/Structure.php
index 64cedae..7de1317 100644
--- a/src/ClassCodeBundle/Entity/Structure.php
+++ b/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
*
--
GitLab