CL-557 ajout des vues dans la migration

.gitignore

@@ -12,3 +12,4 @@
 /.history/
 /.svn/
 config/.routes.yaml.swp
+public/uploads/

config/doctrine/Category.Category.orm.xml

@@ -22,6 +22,8 @@
         <field name="metaOGTitle" column="meta_og_title" type="string" length="100" nullable="true" />
         <field name="metaOGDescription" column="meta_og_description" type="string" length="255" nullable="true" />
 
+        <field name="picture" column="picture" type="string" nullable="true"/>
+
 		 <many-to-one
             field="parent"
             target-entity="Logipro\CaptainLearning\Entity\Category\Category"

config/doctrine/Company.orm.xml

@@ -26,6 +26,8 @@
 		<field name="type" column="type" type="captainEnumCompanyType" />
 		<field name="salariedNumber" column="salaried_number" type="captainEnumCompanySalariedNumberType" />
 
+        <field name="logo" column="logo" type="string" nullable="true"/>
+
         <many-to-one
             field="country"
             target-entity="Logipro\CaptainLearning\Entity\Country">
@@ -34,13 +36,6 @@
 
 		<one-to-one field="client" target-entity="Client" mapped-by="company" />
 
-        <field mapping="company_images"
-			name="imageLogo"
-			filename_property="imageName"
-			nullable="true"
-		/>
-        <field name="imageName" column="image_name" type="text" length="100" nullable="true"/>
-
         <many-to-many field="users" mapped-by="companies" target-entity="Logipro\CaptainLearning\Entity\User\User"/>
 
         <one-to-many

config/doctrine/Estimate.orm.xml

@@ -16,20 +16,20 @@
 		<field name="dateCreate" column="date_create" type="datetime" nullable="false"/>
 		<field name="dateEdit" column="date_edit" type="datetime" nullable="true"/>
 		<field name="statut" column="statut" type="captainEnumEstimateStatutType" />
-		<field name="coment" column="coment" type="text" />
+		<field name="coment" column="coment" type="text" nullable="true"/>
 
 		<field name="clientCivility" column="client_civility" type="captainEnumUserCivilityType" />
-		<field name="clientName" column="client_name" type="text" length="100" />
-		<field name="clientFirstName" column="client_first_name" type="text" length="100" />
-		<field name="clientDenomination" column="client_denomination" type="text" length="100" />
-		<field name="clientAdress" column="client_adress" type="text" />
-		<field name="clientPostalCode" column="client_postal_code" type="text" length="5" />
-		<field name="clientCity" column="client_city" type="text" length="50" />
-		<field name="clientCountry" column="client_country" type="text" length="50" />
-		<field name="clientEmail" column="client_email" type="text" length="100" />
-		<field name="clientPhone" column="client_phone" type="text" length="20" />
-		<field name="reference" column="reference" type="text" length="20" />
-		<field name="object" column="object" type="text" length="100" />
+		<field name="clientName" column="client_name" type="text" length="100"  nullable="true"/>
+		<field name="clientFirstName" column="client_first_name" type="text" length="100"  nullable="true"/>
+		<field name="clientDenomination" column="client_denomination" type="text" length="100"  nullable="true"/>
+		<field name="clientAdress" column="client_adress" type="text"  nullable="true"/>
+		<field name="clientPostalCode" column="client_postal_code" type="text" length="5"  nullable="true"/>
+		<field name="clientCity" column="client_city" type="text" length="50"  nullable="true"/>
+		<field name="clientCountry" column="client_country" type="text" length="50"  nullable="true"/>
+		<field name="clientEmail" column="client_email" type="text" length="100"  nullable="true"/>
+		<field name="clientPhone" column="client_phone" type="text" length="20"  nullable="true"/>
+		<field name="reference" column="reference" type="text" length="20"  nullable="true"/>
+		<field name="object" column="object" type="text" length="100"  nullable="true"/>
 		
 		 <many-to-one
             field="trainingOrganization"

config/doctrine/EstimateLine.orm.xml

@@ -16,8 +16,8 @@
 		<field name="quantity" column="quantity" type="text" length="170" nullable="false" />
 		<field name="price" column="price" type="decimal" scale="4" default="0.0000" nullable="true" />
 		<field name="tva" column="tva" type="decimal" scale="2" default="0.00" />
-		<field name="designation" column="designation" type="text" nullable="false" />
-		<field name="reference" column="reference" type="text" length="170" nullable="false" />
+		<field name="designation" column="designation" type="text" nullable="true" />
+		<field name="reference" column="reference" type="text" length="170" nullable="true" />
 		<field name="orderLine" column="order_line" type="integer" nullable="true" />
 		
 		 <many-to-one

config/doctrine/Record.orm.xml

@@ -22,7 +22,6 @@
             <join-column nullable="true" name="ref_client" referenced-column-name="client_id"/>
         </many-to-one>
 
-
 		<many-to-many field="persons" inversed-by="records" target-entity="Logipro\CaptainLearning\Entity\Person">
             <join-table name="cpt_map_list_person">
                 <join-columns>
@@ -34,8 +33,9 @@
             </join-table>
         </many-to-many>
 
+
 		<many-to-many field="trainings" inversed-by="records" target-entity="Logipro\CaptainLearning\Entity\Training\Training">
-            <join-table name="cpt_map_list_training">
+            <join-table name="cpt_map_record_training">
                 <join-columns>
                     <join-column name="ref_record" referenced-column-name="record_id" />
                 </join-columns>

config/doctrine/Training.Training.orm.xml

@@ -46,16 +46,13 @@
 		<field name="maximalPlaceNumber" column="maximal_place_number" type="integer" default="0"/>
 		<field name="videoUrl" column="video_url" type="text" length="255" nullable="true"/>
 		
-		<field mapping="cover"
-			name="coverFile"
-			filename_property="image"
-			nullable="true"
-		/>
-		<field mapping="logo"
-			name="logoFile"
-			filename_property="image"
-			nullable="true"
-		/>
+		<field name="logo" column="logo" type="string" nullable="true"/>
+		<field name="cover" column="cover" type="string" nullable="true"/>
+		<field name="pictureOne" column="picture_one" type="string" nullable="true"/>
+		<field name="pictureTwo" column="picture_two" type="string" nullable="true"/>
+		<field name="pictureTree" column="picture_tree" type="string" nullable="true"/>
+		<field name="pictureFour" column="picture_four" type="string" nullable="true"/>
+		<field name="pictureFive" column="picture_five" type="string" nullable="true"/>
 
 		<field name="priceOnRequest" column="price_on_request" type="boolean" />
 		<field name="eligibleCPF" column="eligibl_cpf" type="boolean" />

config/doctrine/TrainingOrganization.orm.xml

@@ -34,7 +34,12 @@
         <field name="acceptSubrogation" column="accept_subrogation" type="boolean" default="0"/>
         <field name="description" column="description" type="text" nullable="true"/>
         
-       
+        <field name="cover" column="cover" type="string" nullable="true"/>
+        <field name="logo" column="logo" type="string" nullable="true"/>
+        <field name="kbis" column="kbis" type="string" nullable="true"/>
+        <field name="identity" column="identity" type="string" nullable="true"/>
+        <field name="banner" column="banner" type="string" nullable="true"/>
+
         <one-to-one field="company" target-entity="Company">
             <join-column nullable="false" name="ref_company" referenced-column-name="company_id" />
         </one-to-one>

config/packages/vich_uploader.yaml

@@ -8,7 +8,7 @@ vich_uploader:
       - { path: '%kernel.project_dir%/config/vich_uploader', namespace_prefix: 'Logipro\CaptainLearning' }
 
   mappings:
-    user_images:
+    pictures:
       uri_prefix:         '%app.url.upload_public%'
       upload_destination: '%app.path.upload_dir%'
 

config/routes.yaml

@@ -162,3 +162,7 @@ admin_category_edit:
 admin_training:
   path: /admin/training
   controller: \Logipro\CaptainLearning\Controller\BackOffice\Admin\TrainingController::drawList
+
+drawUpload:
+  path: /view/{name}
+  controller: \Logipro\CaptainLearning\Controller\Common\FileController::drawFile

config/services.yaml

@@ -2,8 +2,8 @@ parameters:
   # Config pour envoyer des emails
   app.notifications.email_sender: captain@logipro.com
   app.path.upload_dir: '%kernel.project_dir%/public/uploads'
-  app.path.upload_temp_dir: '%kernel.project_dir%/public/uploads/tmp'
-  app.url.upload_public: '%env(APP_URL_PREFIX)%/uploads'
+  app.path.upload_temp_dir: '%kernel.project_dir%/var/uploads'
+  app.url.upload_public: '%env(APP_URL_PREFIX)%/view'
 
 services:
   # default configuration for services in *this* file

config/vich_uploader/Entity.Company.xml

@@ -0,0 +1,6 @@
+<vich_uploader class="Logipro\CaptainLearning\Entity\Company">
+	<field mapping="pictures"
+		name="logoFile"
+		filename_property="logo"
+		/>
+</vich_uploader>

config/vich_uploader/Entity.User.User.xml

@@ -1,5 +1,5 @@
 <vich_uploader class="Logipro\CaptainLearning\Entity\User\User">
-	<field mapping="user_images"
+	<field mapping="pictures"
 		name="fotoFile"
 		filename_property="foto"
 		/>

src/CaptainLearning/Command/MigrateCommand.php

@@ -17,6 +17,7 @@ use Logipro\CaptainLearning\Entity\Type\EnumSessionPlanType;
 use Logipro\CaptainLearning\Entity\Type\EnumPersonStatutType;
 use Logipro\CaptainLearning\Entity\Type\EnumTrainingTypeType;
 use Logipro\CaptainLearning\Entity\Type\EnumUserCivilityType;
+use Logipro\CaptainLearning\Entity\Type\EnumEstimateStatutType;
 use Logipro\CaptainLearning\Entity\Type\EnumTrainingStatutType;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Logipro\CaptainLearning\Entity\Type\EnumTrainingCertificationType;
@@ -211,6 +212,18 @@ class MigrateCommand extends ContainerAwareCommand
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
+			// corrige les références erronées
+			$refSession = $row['ref_session'];
+			if (!$this->testDistRef('session',$refSession))
+			{
+				$refSession = null;
+			}
+			$refEstimate = $row['ref_devis'];
+			if (!$this->testDistRef('estimate',$refEstimate))
+			{
+				continue;
+			}
+			
 			// ajoute le devis
 			$newCountry = array(
 				"estimateLine_id" => $row['id_ligne_devis'],
@@ -219,8 +232,8 @@ class MigrateCommand extends ContainerAwareCommand
 				"tva" => $row['tva'],
 				"designation" => $row['designation'],
 				"reference" =>$row['reference'],
-				"ref_session" => $this->setValueIfEqual(null,$row['ref_session']),
-				"ref_estimate" => $row['ref_devis'],
+				"ref_session" => $this->setValueIfEqual(null,$refSession),
+				"ref_estimate" => $refEstimate,
 				"order_line" => $row['ordre'],
 			);
 
@@ -228,6 +241,19 @@ class MigrateCommand extends ContainerAwareCommand
 		}
 	}
 
+	private function getEnumValue($options,$value,$defaultValue)
+	{
+		if (!isset($options[$value]))
+		{
+			if (!$defaultValue)
+			{
+				return reset($options);
+			}
+			return $defaultValue;
+		}
+		return $options[$value];
+	}
+
 	protected function migrateEstimate()
 	{
 		$newTableName = 'cpt_estimate';
@@ -244,18 +270,49 @@ class MigrateCommand extends ContainerAwareCommand
 			"F" => EnumUserCivilityType::CIVILITY_MS,
 		);
 
+		$statut = array(
+			'DEMANDE_EN_ATTENTE' => EnumEstimateStatutType::STATUT_WAITING,
+			'DEMANDE_REFUSEE' => EnumEstimateStatutType::STATUT_REFUSED,
+			'DEVIS_A_EMETTRE' => EnumEstimateStatutType::STATUT_FOR_EMIT,
+			'DEVIS_EMIS' => EnumEstimateStatutType::STATUT_EMIT,
+			'PAIEMENT_EN_COURS' => EnumEstimateStatutType::STATUT_PAYMENT,
+			'PAIEMENT_SUCCES' => EnumEstimateStatutType::STATUT_PAYMENT_SUCCES,
+			'PAIEMENT_ECHEC' => EnumEstimateStatutType::STATUT_PAYMENT_FAIL
+		);
+
 		$query = 'SELECT * FROM ' . $oldTableName;
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
+			$row['ref_formation_intra'];
+
+			// corrige les références erronées
+			$refTraining = $row['ref_formation_intra'];
+			if (!$this->testDistRef('training',$refTraining))
+			{
+				$refTraining = null;
+			}
+
+			$refClient = $row['ref_client'];
+			if (!$this->testDistRef('client',$refClient))
+			{
+				continue;
+			}
+
+			$refTrainingOrganization = $row['ref_organisme_formation'];
+			if (!$this->testDistRef('training_organization',$refTrainingOrganization))
+			{
+				continue;
+			}
+
 			// ajoute le devis
 			$newEstimate = array(
 				"estimate_id" => $row['id_devis'],
 				"date_create" => $row['date_creation'],
 				"date_edit" => $this->setValueIfEqual(null,$row['date_modification'],"0000-00-00 00:00:00"),
-				"statut" => $row['statut'],
+				"statut" => $this->getEnumValue($statut,$row['statut'],EnumEstimateStatutType::STATUT_WAITING),
 				"coment" => $row['commentaire'],
-				"client_civility" => $civilities[$row['client_genre']],
+				"client_civility" => $this->getEnumValue($civilities,$row['client_genre'],EnumUserCivilityType::CIVILITY_NA),
 				"client_name" => $row['client_nom'],
 				"client_first_name" => $row['client_prenom'],
 				"client_denomination" => $row['client_denomination'],
@@ -267,9 +324,9 @@ class MigrateCommand extends ContainerAwareCommand
 				"client_phone" => $row['client_tel'],
 				"reference" => $row['reference'],
 				"object" => $row['objet'],
-				"ref_training_organization" => $row['ref_organisme_formation'],
-				"ref_client" => $row['ref_client'],
-				"ref_training" => $row['ref_formation_intra'],
+				"ref_training_organization" => $refTrainingOrganization,
+				"ref_client" => $refClient,
+				"ref_training" => $refTraining,
 			);
 			$this->insertData($newTableName,$newEstimate);
 		}
@@ -304,6 +361,12 @@ class MigrateCommand extends ContainerAwareCommand
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
+			$refFormation = $row['ref_formation'];
+			if (!$this->testDistRef('training',$refFormation))
+			{
+				continue;
+			}
+
 			// ajoute le nouveau pays
 			$newCountry = array(
 				"session_id" => $row['id_session'],
@@ -313,19 +376,31 @@ class MigrateCommand extends ContainerAwareCommand
 				"date_end_subscribe" => $this->setValueIfEqual(null,$row['date_cloture_inscription'],"0000-00-00 00:00:00"),
 				"minimal_place_number" => $this->setValueIfEqual(0,$row['nombre_place_min']),
 				"maximal_place_number" => $this->setValueIfEqual(0,$row['nombre_place_max']),
-				"statut" => $statut[$row['statut']],
+				"statut" => $this->getEnumValue($statut,$row['statut'],EnumTrainingStatutType::STATUT_NOT_PUBLISHED),
 				"price" => $row['prix_ht'],
 				"duration" => $row['duree'],
 				"staggering" => $row['etalement'],
 				"code" => $row['code'],
 				"ref_place" => $this->setValueIfEqual(null,$row['ref_lieu']),
-				"ref_training" => $row['ref_formation'],
+				"ref_training" => $refFormation,
 			);
 
 			$this->insertData($newTableName,$newCountry);
 		}
 	}
 
+	protected function testDistRef($symfonyObject,$ref)
+	{
+		$query = "SELECT 1 FROM cpt_" . $symfonyObject . " WHERE " . $symfonyObject . "_id=" . (int)$ref;
+		$result = $this->connection->query($query);
+		$row = $result->fetch();
+		if (!$row)
+		{
+			return false;
+		}
+		return true;
+	}
+
 	protected function migrateSessionPlan()
 	{
 		$newTableName = 'cpt_sessionplan';
@@ -346,6 +421,13 @@ class MigrateCommand extends ContainerAwareCommand
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
+			// corrige les références erronées
+			$refEntreprise = $row['ref_entreprise'];
+			if (!$this->testDistRef('company',$refEntreprise))
+			{
+				$refEntreprise = null;
+			}
+
 			if ($row['date_debut'] == "0000-00-00 00:00:00")
 			{
 				continue;
@@ -358,10 +440,10 @@ class MigrateCommand extends ContainerAwareCommand
 				"date_end" => $row['date_fin'],
 				"duration" => $row['duree'],
 				"date_create" => $this->setValueIfEqual(date("Y-m-d h:i:s"),$row['date_creation'],"0000-00-00 00:00:00"),
-				"type" => $types[$row['type']],
+				"type" => $this->getEnumValue($types,$row['type'],EnumSessionPlanType::TYPE_USER_WISH),
 				"description" => $row['description'],
 				"ref_session" => $this->setValueIfEqual(null,$row['ref_session']),
-				"ref_company" => $this->setValueIfEqual(null,$row['ref_entreprise']),
+				"ref_company" => $this->setValueIfEqual(null,$refEntreprise),
 				"ref_training" => $this->setValueIfEqual(null,$row['ref_formation']),
 				"ref_user" => $this->setValueIfEqual(null,$row['ref_utilisateur']),
 			);
@@ -373,8 +455,13 @@ class MigrateCommand extends ContainerAwareCommand
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
+			$refSessionPlan = $row['ref_session_plan'];
+			if (!$this->testDistRef('sessionplan',$refSessionPlan))
+			{
+				continue;
+			}
 			$data = array(
-				"ref_session_plan" => $row['ref_session_plan'],
+				"ref_session_plan" => $refSessionPlan,
 				"ref_person" => $row['ref_personne'],
 			);
 
@@ -416,7 +503,7 @@ class MigrateCommand extends ContainerAwareCommand
 				"ref_client" => $refClient,
 				"size" => $row['taille'],
 				"name" => $row['nom'],
-				"type" => $types[$row['type']],
+				"type" => $this->getEnumValue($types,$row['type'],EnumRecordType::TYPE_OTHER),
 			);
 
 			$this->insertData($newTableName,$newCountry);
@@ -428,10 +515,10 @@ class MigrateCommand extends ContainerAwareCommand
 		{
 			$data = array(
 				"ref_training" => $row['ref_formation'],
-				"ref_list" => $row['ref_liste'],
+				"ref_record" => $row['ref_liste'],
 			);
 
-			$this->insertData('cpt_map_list_training',$data);
+			$this->insertData('cpt_map_record_training',$data);
 		}
 
 		$query = 'SELECT * FROM cpt_map_liste_personne';
@@ -493,14 +580,14 @@ class MigrateCommand extends ContainerAwareCommand
 			// ajoute le nouveau pays
 			$newCountry = array(
 				"person_id" => $row['id_personne'],
-				"civility" => $civilities[$row['civilite']],
+				"civility" => $this->getEnumValue($civilities,$row['civilite'],EnumUserCivilityType::CIVILITY_NA),
 				"name" => $row['nom'],
 				"first_name" => $row['prenom'],
 				"email" => $row['email'],
 				"address" => $row['adresse'],
 				"postal_code" => $row['code_postal'],
 				"city" => $row['ville'],
-				"statut" => $statuts[$row['statut']],
+				"statut" => $this->getEnumValue($statuts,$row['statut'],EnumPersonStatutType::TYPE_DEMAND),
 				"date_create" => $this->setValueIfEqual(date("Y-m-d h:i:s"),$row['date_creation'],"0000-00-00 00:00:00"),
 				"ref_user" => $refUser,
 				"ref_company" => $row['ref_entreprise'],
@@ -566,14 +653,27 @@ class MigrateCommand extends ContainerAwareCommand
 			"QUALIFIANTE" => EnumTrainingCertificationType::CERTIFICATION_QUALIFYING
 		);
 
-		$query = 'SELECT * FROM ' . $oldTableName;
+		$query = 'SELECT *,cover.vue_file as cover,logo.vue_file as logo FROM ' . $oldTableName . 
+		' left outer join vue as logo on ' . $oldTableName . '.vue_logo=logo.id_vue'.
+		' left outer join vue as cover on ' . $oldTableName . '.vue_couverture=cover.id_vue';
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
+			$refFormation = $row['id_formation'];
+			$queryMap = 'SELECT vue.vue_file as vue_file FROM cpt_map_vue_formation 
+			inner join vue on vue.id_vue=cpt_map_vue_formation.ref_vue
+			WHERE ref_formation=' . $refFormation . ' ORDER BY ordre ASC';
+			$resultMap = $this->oldconnection->query($queryMap);
+			$pictures = array();
+			while ($rowMap = $resultMap->fetch())
+			{
+				$pictures[] = $rowMap["vue_file"];
+			}
+
 			// ajoute le nouveau pays
 			$newCountry = array(
 				"training_id" => $row['id_formation'],
-				"statut" => $statut[$row['statut']],
+				"statut" => $this->getEnumValue($statut,$row['statut'],EnumTrainingStatutType::STATUT_NOT_PUBLISHED),
 				"code" => $row['code'],
 				"name" => $row['nom'],
 				"hook" => $row['accroche'],
@@ -593,9 +693,9 @@ class MigrateCommand extends ContainerAwareCommand
 				"acquired_evaluation" => $row['evaluation_acquis'],
 				"level" => $row['niveau'],
 				"border_modalities" => $row['modalites_encadrement'],
-				"type" => $type[$row['type']],
-				"optionnal_type" => $type[$row['type_optionnel']],
-				"certification" => $certification[$row['certification']],
+				"type" => $this->getEnumValue($type,$row['type'],EnumTrainingTypeType::TYPE_NA),
+				"optionnal_type" => $this->getEnumValue($type,$row['type_optionnel'],EnumTrainingTypeType::TYPE_NA),
+				"certification" => $this->getEnumValue($certification,$row['certification'],EnumTrainingCertificationType::CERTIFICATION_NONE),
 				"date_create" => $row['date_creation'],
 				"date_edit" => $this->setValueIfEqual(null,$row['date_modification'],'0000-00-00 00:00:00'),
 				"date_es" => $this->setValueIfEqual(null,$row['date_synchronisation_elasticsearch'],'0000-00-00 00:00:00'),
@@ -608,8 +708,21 @@ class MigrateCommand extends ContainerAwareCommand
 				"ref_category" => $this->setValueIfEqual(null,$row['ref_categorie']),
 				"ref_buisness_category" => $this->setValueIfEqual(null,$row['ref_categorie_metier']),
 				"ref_place" => $this->setValueIfEqual(null,$row['ref_lieu']),
-				"ref_training_organization" => $row['ref_organisme_formation']
+				"ref_training_organization" => $row['ref_organisme_formation'],
+
+				"logo" => $row['logo'],
+				"cover" => $row['cover'],
+
+				"picture_one" => @$pictures[0],
+				"picture_two" => @$pictures[1],
+				"picture_tree" => @$pictures[2],
+				"picture_four" => @$pictures[3],
+				"picture_five" => @$pictures[4],
 			);
+
+			
+
+
 			$this->insertData($newTableName,$newCountry);
 		}
 	}
@@ -684,7 +797,7 @@ class MigrateCommand extends ContainerAwareCommand
 		);
 
 		$query = 'SELECT * FROM ' . $oldTableName .
-		'left outer join vue on mod_utilisateur.ref_vue=vue.id_vue';
+		' left outer join vue on mod_utilisateur.vue_photo=vue.id_vue';
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
@@ -692,7 +805,7 @@ class MigrateCommand extends ContainerAwareCommand
 			$newUser = array(
 				"user_id" => $row['id_utilisateur'],
 				"email" => $row['mail'],
-				"civility" => $civilities[$row['civilite']],
+				"civility" => $this->getEnumValue($civilities,$row['civilite'],EnumUserCivilityType::CIVILITY_NA),
 				"name" => $row['nom_utilisateur'],
 				"first_name" => $row['prenom'],
 				"role" => EnumRoleType::ROLE_USER,
@@ -787,7 +900,9 @@ class MigrateCommand extends ContainerAwareCommand
 			return;
 		}
 
-		$query = 'SELECT * FROM ' . $oldTableName;
+		$query = 'SELECT * FROM ' . $oldTableName . 
+		' left outer join vue on ' . $oldTableName . '.vue_logo=vue.id_vue';
+		
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
@@ -805,9 +920,10 @@ class MigrateCommand extends ContainerAwareCommand
 				"submit_tva" => $row['soumis_tva'],
 				"intra_community_tva" => $row['tva_intracommunautaire'],
 				"date_create" => $row['date_creation_fiche'],
-				"type" => $types[$row['type_societe']],
+				"type" => $this->getEnumValue($types,$row['type_societe'],EnumCompanyType::TYPE_COMPANY),
 				"salaried_number" => $row['nombre_salarie'],
 				"ref_country" => $row['ref_pays'],
+				"logo" => $row['vue_file']
 			);
 
 			/* @FIXME pour les vues
@@ -864,14 +980,20 @@ class MigrateCommand extends ContainerAwareCommand
 			return;
 		}
 
-		$query = 'SELECT * FROM ' . $oldTableName;
+		$query = 'SELECT *,cover.vue_file as cover,logo.vue_file as logo,kbis.vue_file as kbis,identite.vue_file as identite,banner.vue_file as banner FROM ' . $oldTableName . 
+		' left outer join vue as cover on ' . $oldTableName . '.vue_couverture=cover.id_vue'.
+		' left outer join vue as logo on ' . $oldTableName . '.vue_logo=logo.id_vue'.
+		' left outer join vue as kbis on ' . $oldTableName . '.vue_kbis=kbis.id_vue'.
+		' left outer join vue as identite on ' . $oldTableName . '.vue_identite=identite.id_vue'.
+		' left outer join vue as banner on ' . $oldTableName . '.vue_banniere=banner.id_vue';
+
 		$result = $this->oldconnection->query($query);
 		while ($row = $result->fetch())
 		{
 			// ajoute le nouvel of
 			$newTrainingOrganization = array(
 				"training_organization_id" => $row['id_organisme_formation'],
-				"valid" => $typesValid[$row['valide']],
+				"valid" => $this->getEnumValue($typesValid,$row['valide'],EnumTrainingOrganizationValidType::VALID_WAITING),
 				"number" => $row['numero'],
 				"number_quality_agreement" => $row['numero_agrement_qualite'],
 				//"date_quality_agreement" => $dateAgreement,
@@ -892,7 +1014,15 @@ class MigrateCommand extends ContainerAwareCommand
 				"stripe_publishable_key" => $row['stripe_publishable_key'],
 				"is_datadocked" => $row['est_datadock'],
 				"accept_subrogation" => $row['accept_paiement_subrogation'],
-				"description" => $row['description']
+				"description" => $row['description'],
+
+				"cover" => $row['cover'],
+				"logo" => $row['logo'],
+				"kbis" => $row['kbis'],
+				"identity" => $row['identite'],
+				"banner" => $row['banner']
+
+
 			);
 
 			$dateAgreement = $row['date_agrement_qualite'];
@@ -982,7 +1112,9 @@ class MigrateCommand extends ContainerAwareCommand
 		$newTableName = 'cpt_category';
 		$oldTableName = 'cpt_categorie';
 
-		$query = "SELECT * FROM $oldTableName WHERE ref_categorie=" . (int)$refCategory;
+		$query = "SELECT * FROM $oldTableName " . 
+		' left outer join vue on ' . $oldTableName . '.vue_image=vue.id_vue' .
+		" WHERE ref_categorie=" . (int)$refCategory;
 		$result = $this->oldconnection->query($query);
 
 		$classifications = array(
@@ -999,7 +1131,7 @@ class MigrateCommand extends ContainerAwareCommand
 				"category_id" => $idCategorie,
 				"name" => $row["nom"],
 				"level" => $row["niveau"],
-				"type_classification" => $classifications[$row["type_classification"]],
+				"type_classification" => $this->getEnumValue($classifications,$row["type_classification"],EnumCategoryType::TYPE_CATEGORY),
 				"keywords" => $row["mots_cles"],
 				"buisness_code" => $row["code_metier"],
 				"meta_title" => $row["meta_title"],
@@ -1007,6 +1139,7 @@ class MigrateCommand extends ContainerAwareCommand
 				"meta_og_title" => $row["meta_og_title"],
 				"meta_og_description" => $row["meta_og_description"],
 				"ref_category" => $this->setValueIfEqual(null,$row["ref_categorie"],0),
+				"picture" => $row['vue_file'],
 			);
 
 			$this->insertData($newTableName,$newCategory);

src/CaptainLearning/Controller/Common/FileController.php

@@ -0,0 +1,23 @@
+<?php
+namespace Logipro\CaptainLearning\Controller\Common;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Logipro\CaptainLearning\Controller\AppController;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+
+class FileController extends AppController
+{
+	public function drawFile($name,Request $request)
+	{
+		$path = $this->getParameter('app.path.upload_dir') . "/" . $name;
+		if (file_exists($path))
+		{
+			return $this->file($path,$name,ResponseHeaderBag::DISPOSITION_INLINE);
+		}
+		return new Response();
+		
+	}
+}
+?>

src/CaptainLearning/Entity/Category/Category.php

@@ -38,6 +38,8 @@ class Category extends AbstractEntity
     private $metaOGTitle = '';
     private $metaOGDescription = '';
 
+    private $picture;
+
     public function __construct()
     {
         $this->children = new ArrayCollection();

src/CaptainLearning/Entity/Company.php

@@ -100,8 +100,8 @@ class Company extends AbstractEntity
 	 */
 	protected $client;
 
-	protected $imageLogo;
-	protected $imageName;
+	protected $logo;
+	protected $logoFile;
 
 	/**
 	 * 

src/CaptainLearning/Entity/Training/Training.php

@@ -201,15 +201,14 @@ class Training extends AbstractEntity
      */
     protected $videoUrl;
 
-    /**
-     * couverture
-     */
-    protected $coverFile;
-
-    /**
-     * logo
-     */
-    protected $logoFile;
+    protected $cover;
+    protected $logo;
+
+    protected $pictureOne;
+    protected $pictureTwo;
+    protected $pictureTree;
+    protected $pictureFour;
+    protected $pictureFive;
 
     /**
      * prix sur demande

src/CaptainLearning/Entity/TrainingOrganization.php

@@ -141,6 +141,12 @@ class TrainingOrganization extends AbstractEntity
 	 * @var Company
 	 */
 	protected $company;
+
+	protected $cover;
+	protected $logo;
+	protected $kbis;
+	protected $identity;
+	protected $banner;
 	
 	public function __construct()
 	{

translations/messages.fr.xlf

@@ -1129,8 +1129,8 @@
 				<source>label_profil_welcome</source>
 				<target>Bonjour matelot</target>
 			</trans-unit>
-			<trans-unit id="abel_profil_welcome_widget_content">
-				<source>abel_profil_welcome_widget_content</source>
+			<trans-unit id="label_profil_welcome_widget_content">
+				<source>label_profil_welcome_widget_content</source>
 				<target>C'est ici que vous allez pouvoir :</target>
 			</trans-unit>
 			<trans-unit id="label_profil_welcome_to_profil_action">