diff --git a/src/ClassCodeBundle/Controller/StructureController.php b/src/ClassCodeBundle/Controller/StructureController.php
index 2dea6dba91e025680a0ff5e02b89661e0fd3d062..d875cf63f862f01840b62afe4f777d2dbc3c03e8 100644
--- a/src/ClassCodeBundle/Controller/StructureController.php
+++ b/src/ClassCodeBundle/Controller/StructureController.php
@@ -63,6 +63,7 @@ class StructureController extends Controller
$userName = $user->getUserName();
$StructureName = ltrim(rtrim($request->request->get("StructureName")));
+ $StructureType = ltrim(rtrim($request->request->get("StructureType")));
$StructureLogo = ltrim(rtrim($request->request->get("StructureLogo")));
$StructureUrl = ltrim(rtrim($request->request->get("StructureUrl")));
$StructureWho = ltrim(rtrim($request->request->get("StructureWho")));
@@ -75,12 +76,13 @@ class StructureController extends Controller
($StructureAddress !='')){
$entity_structure = $em->getRepository('ClassCodeBundle:Structure')->findOneBy(
- array('name' => $StructureName)
+ array('name' => $StructureName, 'mainType'=>$StructureType)
);
if(!$entity_structure){
$entity_structure = new Structure();
$entity_structure->setName($StructureName);
+ $entity_structure->setMainType($StructureType);
$entity_structure->setLogo($StructureLogo);
$entity_structure->setUrl($StructureUrl);
$entity_structure->setWho($StructureWho);
@@ -88,7 +90,7 @@ class StructureController extends Controller
$entity_structure->setAddress($StructureAddress);
$entity_structure->setLatitude($StructureLatitude);
$entity_structure->setLongitude($StructureLongitude);
-
+ $entity_structure->setDataSource("web");
$entity_structure->setUpdatedAt(new \DateTime());
$entity_structure->setUpdatedBy($userName);
$em->persist($entity_structure);
@@ -120,7 +122,8 @@ class StructureController extends Controller
$userName = $user->getUserName();
$StructureId = ltrim(rtrim($request->request->get("StructureEditId")));
- $StructureName = ltrim(rtrim($request->request->get("StructureEditName")));
+ $StructureName = ltrim(rtrim($request->request->get("StructureEditName")));
+ $StructureType = ltrim(rtrim($request->request->get("StructureEditType")));
$StructureLogo = ltrim(rtrim($request->request->get("StructureEditLogo")));
$StructureUrl = ltrim(rtrim($request->request->get("StructureEditUrl")));
$StructureWho = ltrim(rtrim($request->request->get("StructureEditWho")));
@@ -141,14 +144,17 @@ class StructureController extends Controller
->createQueryBuilder('structure')
->select('structure')
->where('structure.name = :StructureName')
+ ->andwhere('structure.mainType = :StructureType')
->andwhere('structure.id != :StructureId')
->setParameter('StructureName',$StructureName)
+ ->setParameter('StructureType',$StructureType)
->setParameter('StructureId',$StructureId)
->getQuery()
->getResult();
if(!$entity_structure){
$structure->setName($StructureName);
+ $structure->setMainType($StructureType);
$structure->setLogo($StructureLogo);
$structure->setUrl($StructureUrl);
$structure->setWho($StructureWho);
@@ -156,7 +162,7 @@ class StructureController extends Controller
$structure->setAddress($StructureAddress);
$structure->setLatitude($StructureLatitude);
$structure->setLongitude($StructureLongitude);
-
+ $structure->setDataSource("web");
$structure->setUpdatedAt(new \DateTime());
$structure->setUpdatedBy($userName);
$em->persist($structure);
diff --git a/src/ClassCodeBundle/Resources/views/Structure/addStructureFormModal.html.twig b/src/ClassCodeBundle/Resources/views/Structure/addStructureFormModal.html.twig
index a5c07ba4bb4172e30f506ec7f46340d5f2d994d9..9ce0c0841c98abac04724eb20b8ef391e2d98fc2 100644
--- a/src/ClassCodeBundle/Resources/views/Structure/addStructureFormModal.html.twig
+++ b/src/ClassCodeBundle/Resources/views/Structure/addStructureFormModal.html.twig
@@ -5,6 +5,15 @@
</div>
<form method="post" class="form-horizontal" id="addStructureForm" action="{{ path('structure_create') }}">
<div class="modal-body">
+ <div id="StructureTypeFormGroup" class="form-group">
+ <label class="col-sm-3 control-label">{{ 'structure.type'|trans }}<span class=text-danger>*</span></label>
+ <div class="col-sm-9">
+ <input required disabled class="form-control" title="StructureType" type="text" name="StructureType" id="StructureType" value="Partenaire Classcode" >
+ </div>
+ <div id="StructureTypeRequired" class="col-sm-2 text-danger hidden">
+ {{ 'required'|trans }}
+ </div>
+ </div>
<div id="StructureNameFormGroup" class="form-group">
<label class="col-sm-3 control-label">{{ 'structure.name'|trans }}<span class=text-danger>*</span></label>
<div class="col-sm-9">
diff --git a/src/ClassCodeBundle/Resources/views/Structure/ajax_list.html.twig b/src/ClassCodeBundle/Resources/views/Structure/ajax_list.html.twig
index 436ebe182f21757586a2f2fe4138fbd33e01a503..9a5e23a70a1de11711a490d2db2f96dcecdddd2d 100644
--- a/src/ClassCodeBundle/Resources/views/Structure/ajax_list.html.twig
+++ b/src/ClassCodeBundle/Resources/views/Structure/ajax_list.html.twig
@@ -17,7 +17,7 @@
<tr>
<td>
{% if is_granted('ROLE_ADMIN') or (is_granted('ROLE_USER') and ((app.user.userName == structure.getUpdatedBy))) %}
- <a href="#EditStructure" class="EditStructure" data-structureid="{{ structure.getId }}" data-structurename="{{ structure.getName }}" data-structurelogo="{{ structure.getLogo }}" data-structurewho="{{ structure.getWho }}" data-structureemail="{{ structure.getEmail}}" data-structureurl="{{ structure.getUrl }}" data-structureaddress="{{ structure.getAddress }}" data-structurelat="{{ structure.getLatitude }}" data-structurelong="{{ structure.getLongitude }}" data-toggle="modal" data-target="#EditStructure" >{{ structure.getName }}</a>
+ <a href="#EditStructure" class="EditStructure" data-structureid="{{ structure.getId }}" data-structurename="{{ structure.getName }}" data-structuretype="{{ structure.getMainType }}" data-structurelogo="{{ structure.getLogo }}" data-structurewho="{{ structure.getWho }}" data-structureemail="{{ structure.getEmail}}" data-structureurl="{{ structure.getUrl }}" data-structureaddress="{{ structure.getAddress }}" data-structurelat="{{ structure.getLatitude }}" data-structurelong="{{ structure.getLongitude }}" data-toggle="modal" data-target="#EditStructure" >{{ structure.getName }}</a>
{% else %}
{{ structure.getName }}
{% endif %}
diff --git a/src/ClassCodeBundle/Resources/views/Structure/editStructureFormModal.html.twig b/src/ClassCodeBundle/Resources/views/Structure/editStructureFormModal.html.twig
index 701c6cb652717cd4195f9b646593536fed67e12c..5be5b643becc950f97f126d03c95bd8f53b5636c 100644
--- a/src/ClassCodeBundle/Resources/views/Structure/editStructureFormModal.html.twig
+++ b/src/ClassCodeBundle/Resources/views/Structure/editStructureFormModal.html.twig
@@ -6,6 +6,15 @@
<form method="post" class="form-horizontal" id="editStructureForm" action="{{ path('structure_edit') }}">
<input type="hidden" id="StructureEditId" name="StructureEditId" value="">
<div class="modal-body">
+ <div id="StructureEditTypeFormGroup" class="form-group">
+ <label class="col-sm-3 control-label">{{ 'structure.type'|trans }}<span class=text-danger>*</span></label>
+ <div class="col-sm-9">
+ <input required disabled class="form-control" title="StructureType" type="text" name="StructureEditType" id="StructureEditType" >
+ </div>
+ <div id="StructureTypeRequired" class="col-sm-2 text-danger hidden">
+ {{ 'required'|trans }}
+ </div>
+ </div>
<div id="StructureEditNameFormGroup" class="form-group">
<label class="col-sm-3 control-label">{{ 'structure.name'|trans }}<span class=text-danger>*</span></label>
<div class="col-sm-9">
diff --git a/src/ClassCodeBundle/Resources/views/Structure/list.html.twig b/src/ClassCodeBundle/Resources/views/Structure/list.html.twig
index 46cb2baa74a8dd365d11d369841976e75fcbb4e5..680e8f37f1d1d175edd5c6f1f99d19a2481477ea 100644
--- a/src/ClassCodeBundle/Resources/views/Structure/list.html.twig
+++ b/src/ClassCodeBundle/Resources/views/Structure/list.html.twig
@@ -224,6 +224,7 @@
$(".EditStructure").click(function(){
$("#StructureEditId").val($(this).attr("data-structureid"));
+ $("#StructureEditName").val($(this).attr("data-structuretype"));
$("#StructureEditName").val($(this).attr("data-structurename"));
$("#StructureEditLogo").val($(this).attr("data-structurelogo"));
$("#StructureEditUrl").val($(this).attr("data-structureurl"));