NEW #10 Renommage et initialisation pour la Fiche collège

CD67.FicheCollege.BDD/CD67.FicheCollege.BDD.sqlproj

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Name>CD67.FicheCollege.BDD</Name>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectVersion>4.1</ProjectVersion>
+    <ProjectGuid>{104fc704-5a60-4f2b-b52b-4a95fbb7a4ab}</ProjectGuid>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
+    <OutputType>Database</OutputType>
+    <RootPath>
+    </RootPath>
+    <RootNamespace>CD67.FicheCollege.BDD</RootNamespace>
+    <AssemblyName>CD67.FicheCollege.BDD</AssemblyName>
+    <ModelCollation>1033, CI</ModelCollation>
+    <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
+    <DeployToDatabase>True</DeployToDatabase>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetLanguage>CS</TargetLanguage>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <SqlServerVerification>False</SqlServerVerification>
+    <IncludeCompositeObjects>True</IncludeCompositeObjects>
+    <TargetDatabaseSet>True</TargetDatabaseSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
+    <SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
+    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <ItemGroup>
+    <Folder Include="Properties" />
+  </ItemGroup>
+</Project>

CD67.FicheCollege.Entity/App.config

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!-- Configuration minimale pour avoir accès à la connexion à la base de données pour le Model -->
+  <configSections>
+    <section name="entityFramework"
+      type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+      requirePermission="false"/>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+  </configSections>
+  <entityFramework>
+    <!-- Suppression du provider par défaut qui stipule SQL server
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
+    -->
+    <providers>
+      <!--<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>-->
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+    </providers>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="mssqllocaldb"/>
+      </parameters>
+    </defaultConnectionFactory>
+  </entityFramework>
+  <connectionStrings>
+    <!-- Copie locale de la chaine de connexion pour l'éditeur graphique de modèle -->
+    <add name="ModeleMVCEntities"
+      connectionString="metadata=res://*/EntityModel.csdl|res://*/EntityModel.ssdl|res://*/EntityModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=T-MSSQL-02\SQLSTD2K14;initial catalog=FicheCollege;persist security info=True;user id=FicheCollege_admin;password=bk9JFwqSwYw7mEPiOhnu;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient"/>
+  </connectionStrings>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+  </startup>
+</configuration>

CD67.ModeleMVC.Entity/CD67.ModeleMVC.Entity.csproj → CD67.FicheCollege.Entity/CD67.FicheCollege.Entity.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{5BDB34B4-4387-4AF7-B388-37D4907DDE39}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CD67.ModeleMVC.Entity</RootNamespace>
-    <AssemblyName>CD67.ModeleMVC.Entity</AssemblyName>
+    <RootNamespace>CD67.FicheCollege.Entity</RootNamespace>
+    <AssemblyName>CD67.FicheCollege.Entity</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -32,19 +32,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Oracle.ManagedDataAccess.12.2.1100\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess.EntityFramework, Version=6.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Oracle.ManagedDataAccess.EntityFramework.12.2.1100\lib\net45\Oracle.ManagedDataAccess.EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SolrTools, Version=1.6.14.0, Culture=neutral, processorArchitecture=MSIL">
@@ -82,17 +74,9 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>EntityModel.edmx</DependentUpon>
     </Compile>
-    <Compile Include="Extend\Viking.cs" />
-    <Compile Include="Extend\TypeViking.cs" />
     <Compile Include="Internal\Entities.cs" />
     <Compile Include="Internal\FormattedDbEntityValidationException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TypeViking.cs">
-      <DependentUpon>EntityModel.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Viking.cs">
-      <DependentUpon>EntityModel.tt</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">
@@ -125,6 +109,9 @@
       <LastGenOutput>EntityModel.cs</LastGenOutput>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Extend\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

CD67.ModeleMVC.Entity/EntityModel.Context.cs → CD67.FicheCollege.Entity/EntityModel.Context.cs

@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace CD67.ModeleMVC.Entity
+namespace CD67.FicheCollege.Entity
 {
     using System;
     using System.Data.Entity;
@@ -25,7 +25,5 @@ namespace CD67.ModeleMVC.Entity
             throw new UnintentionalCodeFirstException();
         }
     
-        public virtual DbSet<TypeViking> TypesViking { get; set; }
-        public virtual DbSet<Viking> Vikings { get; set; }
     }
 }

CD67.ModeleMVC.Entity/EntityModel.Designer.cs → CD67.FicheCollege.Entity/EntityModel.Designer.cs

@@ -1,4 +1,4 @@
-// La génération de code T4 est activée pour le modèle 'C:\dev\dotnet\ModeleMVC\CD67.ModeleMVC.Entity\EntityModel.edmx'. 
+// La génération de code T4 est activée pour le modèle 'C:\Users\julien.legrand\Documents\Developpements\FicheCollege\CD67.FicheCollege.Entity\EntityModel.edmx'. 
 // Pour activer la génération de code héritée, définissez la valeur de la propriété
 // du concepteur 'Stratégie de génération de code' sur 'ObjectContext hérité'. Cette propriété est disponible dans la fenêtre Propriétés lorsque le modèle
 //  est ouvert dans le concepteur.

CD67.FicheCollege.Entity/EntityModel.edmx

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
+  <!-- EF Runtime content -->
+  <edmx:Runtime>
+    <!-- SSDL content -->
+    <edmx:StorageModels>
+    <Schema Namespace="ModeleMVC.Store" Alias="Self" Provider="System.Data.SqlClient" ProviderManifestToken="2012" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+  <EntityContainer Name="ModeleMVCStoreContainer">
+    </EntityContainer>
+</Schema></edmx:StorageModels>
+    <!-- CSDL content -->
+    <edmx:ConceptualModels>
+      <Schema Namespace="ModeleMVC" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
+        <EntityContainer Name="ModeleMVCEntities" annotation:LazyLoadingEnabled="true">
+        </EntityContainer>
+      </Schema>
+    </edmx:ConceptualModels>
+    <!-- C-S mapping content -->
+    <edmx:Mappings>
+    <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
+  <EntityContainerMapping StorageEntityContainer="ModeleMVCStoreContainer" CdmEntityContainer="ModeleMVCEntities">
+  </EntityContainerMapping>
+</Mapping></edmx:Mappings>
+  </edmx:Runtime>
+  <!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
+  <Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
+    <Connection>
+      <DesignerInfoPropertySet>
+        <DesignerProperty Name="MetadataArtifactProcessing" Value="EmbedInOutputAssembly" />
+      </DesignerInfoPropertySet>
+    </Connection>
+    <Options>
+      <DesignerInfoPropertySet>
+        <DesignerProperty Name="ValidateOnBuild" Value="true" />
+        <DesignerProperty Name="EnablePluralization" Value="false" />
+        <DesignerProperty Name="IncludeForeignKeysInModel" Value="true" />
+        <DesignerProperty Name="UseLegacyProvider" Value="False" />
+        <DesignerProperty Name="CodeGenerationStrategy" Value="Aucun" />
+      </DesignerInfoPropertySet>
+    </Options>
+    <!-- Diagram content (shape and connector positions) -->
+    <Diagrams></Diagrams>
+  </Designer>
+</edmx:Edmx>

CD67.ModeleMVC.Entity/EntityModel.edmx.diagram → CD67.FicheCollege.Entity/EntityModel.edmx.diagram

@@ -5,9 +5,6 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="86b727c7572a49c5b7e8139c8d489465" Name="Diagram1">
-        <EntityTypeShape EntityType="ModeleMVC.TypeViking" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="ModeleMVC.Viking" Width="1.5" PointX="3.75" PointY="0.625" IsExpanded="true" />
-        <AssociationConnector Association="ModeleMVC.TypeVikingViking" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

CD67.ModeleMVC.Entity/EntityModel.edmx.sql → CD67.FicheCollege.Entity/EntityModel.edmx.sql

@@ -3,7 +3,7 @@
 -- Entity Designer DDL Script for SQL Server 2005, 2008, 2012 and Azure
 -- --------------------------------------------------
 -- Date Created: 08/22/2017 15:00:11
--- Generated from EDMX file: C:\dev\dotnet\ModeleMVC\CD67.ModeleMVC.Entity\EntityModel.edmx
+-- Generated from EDMX file: C:\dev\dotnet\ModeleMVC\CD67.FicheCollege.Entity\EntityModel.edmx
 -- --------------------------------------------------
 
 SET QUOTED_IDENTIFIER OFF;

CD67.ModeleMVC.Entity/Internal/Entities.cs → CD67.FicheCollege.Entity/Internal/Entities.cs

@@ -1,6 +1,6 @@
 using System.Data.Entity.Validation;
 
-namespace CD67.ModeleMVC.Entity
+namespace CD67.FicheCollege.Entity
 {
     public partial class ModeleMVCEntities
     {

CD67.ModeleMVC.Entity/Internal/FormattedDbEntityValidationException.cs → CD67.FicheCollege.Entity/Internal/FormattedDbEntityValidationException.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CD67.ModeleMVC.Entity.Internal
+namespace CD67.FicheCollege.Entity.Internal
 {
     public class FormattedDbEntityValidationException : Exception
     {

CD67.ModeleMVC.Entity/Properties/AssemblyInfo.cs → CD67.FicheCollege.Entity/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // Les informations générales relatives à un assembly dépendent de 
 // l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations
 // associées à un assembly.
-[assembly: AssemblyTitle("CD67.ModeleMVC.Entity")]
+[assembly: AssemblyTitle("CD67.FicheCollege.Entity")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Conseil Départemental du Bas-Rhin")]
-[assembly: AssemblyProduct("CD67.ModeleMVC.Entity")]
+[assembly: AssemblyProduct("CD67.FicheCollege.Entity")]
 [assembly: AssemblyCopyright("Copyright © Conseil Départemental du Bas-Rhin 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

CD67.FicheCollege.Entity/packages.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+  <package id="EntityFramework.fr" version="6.2.0" targetFramework="net461" />
+  <package id="Freyd.SolrTools" version="1.6.14" targetFramework="net461" />
+  <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net451" />
+</packages>

CD67.FicheCollege.Factory/App.config

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <!-- Aucune configuration nécessaire ici, tout est dans le web.config du projet MVC -->
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+  </startup>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="mssqllocaldb" />
+      </parameters>
+    </defaultConnectionFactory>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
+</configuration>

CD67.ModeleMVC.Factory/CD67.ModeleMVC.Factory.csproj → CD67.FicheCollege.Factory/CD67.FicheCollege.Factory.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{6B7EF24A-1AF8-44FB-A290-E42F01FF8812}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CD67.ModeleMVC.Factory</RootNamespace>
-    <AssemblyName>CD67.ModeleMVC.Factory</AssemblyName>
+    <RootNamespace>CD67.FicheCollege.Factory</RootNamespace>
+    <AssemblyName>CD67.FicheCollege.Factory</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -32,11 +32,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -59,14 +59,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>GenericFactories.tt</DependentUpon>
     </Compile>
-    <Compile Include="Internal\TypeVikingFactory.cs">
-      <DependentUpon>GenericFactories.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Internal\VikingFactory.cs">
-      <DependentUpon>GenericFactories.tt</DependentUpon>
-    </Compile>
-    <Compile Include="TypeVikingFactory.cs" />
-    <Compile Include="VikingFactory.cs" />
     <Compile Include="Internal\BaseFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -77,9 +69,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CD67.ModeleMVC.Entity\CD67.ModeleMVC.Entity.csproj">
+    <ProjectReference Include="..\CD67.FicheCollege.Entity\CD67.FicheCollege.Entity.csproj">
       <Project>{5bdb34b4-4387-4af7-b388-37d4907dde39}</Project>
-      <Name>CD67.ModeleMVC.Entity</Name>
+      <Name>CD67.FicheCollege.Entity</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

CD67.ModeleMVC.Factory/Internal/BaseFactory.cs → CD67.FicheCollege.Factory/Internal/BaseFactory.cs

@@ -1,4 +1,4 @@
-using CD67.ModeleMVC.Entity;
+using CD67.FicheCollege.Entity;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
@@ -8,7 +8,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CD67.ModeleMVC.Factory.Internal
+namespace CD67.FicheCollege.Factory.Internal
 {
     /// <summary>
     /// Classe de base pour toutes les classes spécialisées de la couche de service

CD67.ModeleMVC.Factory/Internal/GenericFactories.tt → CD67.FicheCollege.Factory/Internal/GenericFactories.tt

@@ -3,7 +3,7 @@
 <#@ output extension=".cs"#>
 
 <#
-const string inputFile = @"../../CD67.ModeleMVC.Entity/EntityModel.edmx";
+const string inputFile = @"../../CD67.FicheCollege.Entity/EntityModel.edmx";
 var textTransform = DynamicTextTransformation.Create(this);
 var code = new CodeGenerationTools(this);
 var ef = new MetadataTools(this);
@@ -15,16 +15,16 @@ foreach (var entity in typeMapper.GetItemsToGenerate<EntityType>(itemCollection)
 {
     fileManager.StartNewFile(entity.Name + "Factory.cs");
 	#>
-using CD67.ModeleMVC.Entity;
+using CD67.FicheCollege.Entity;
 using System.Linq;
 
-namespace CD67.ModeleMVC.Factory
+namespace CD67.FicheCollege.Factory
 {
 	/// <summary>
     /// NE PAS MODIFIER
     /// C'est une classe partielle, elle peut être complétée avec une classe partielle du même nom
     /// Factory générée automatiquement à l'aide du fichier GenericFactories.tt
-    /// pour toutes les entités du fichier entity : /CD67.ModeleMVC.Entity/EntityModel.edmx
+    /// pour toutes les entités du fichier entity : /CD67.FicheCollege.Entity/EntityModel.edmx
     /// </summary>
 	<#=Accessibility.ForType(entity)#> <#=code.SpaceAfter(code.AbstractOption(entity))#>partial class <#=code.Escape(entity)#>Factory : Internal.BaseFactory<Entity.<#=code.Escape(entity)#>>
 	{

CD67.ModeleMVC.Factory/Properties/AssemblyInfo.cs → CD67.FicheCollege.Factory/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // Les informations générales relatives à un assembly dépendent de 
 // l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations
 // associées à un assembly.
-[assembly: AssemblyTitle("CD67.ModeleMVC.Factory")]
+[assembly: AssemblyTitle("CD67.FicheCollege.Factory")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Conseil Départemental du Bas-Rhin")]
-[assembly: AssemblyProduct("CD67.ModeleMVC.Factory")]
+[assembly: AssemblyProduct("CD67.FicheCollege.Factory")]
 [assembly: AssemblyCopyright("Copyright © Conseil Départemental du Bas-Rhin 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

CD67.ModeleMVC.Factory/packages.config → CD67.FicheCollege.Factory/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework" version="6.1.3" targetFramework="net451" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
   <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net451" />
 </packages>

CD67.ModeleMVC.MVC/App_Start/BundleConfig.cs → CD67.FicheCollege.MVC/App_Start/BundleConfig.cs

@@ -1,7 +1,7 @@
 using System.Web;
 using System.Web.Optimization;
 
-namespace CD67.ModeleMVC.MVC
+namespace CD67.FicheCollege.MVC
 {
     public class BundleConfig
     {

CD67.ModeleMVC.MVC/App_Start/FilterConfig.cs → CD67.FicheCollege.MVC/App_Start/FilterConfig.cs

@@ -1,7 +1,7 @@
 using System.Web;
 using System.Web.Mvc;
 
-namespace CD67.ModeleMVC.MVC
+namespace CD67.FicheCollege.MVC
 {
     public class FilterConfig
     {

CD67.ModeleMVC.MVC/App_Start/RouteConfig.cs → CD67.FicheCollege.MVC/App_Start/RouteConfig.cs

@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
 
-namespace CD67.ModeleMVC.MVC
+namespace CD67.FicheCollege.MVC
 {
     public class RouteConfig
     {

CD67.ModeleMVC.MVC/App_Start/WebApiConfig.cs → CD67.FicheCollege.MVC/App_Start/WebApiConfig.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web.Http;
 
-namespace CD67.ModeleMVC.MVC
+namespace CD67.FicheCollege.MVC
 {
     public static class WebApiConfig
     {

CD67.ModeleMVC.MVC/CD67.ModeleMVC.MVC.csproj → CD67.FicheCollege.MVC/CD67.FicheCollege.MVC.csproj

@@ -11,8 +11,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CD67.ModeleMVC.MVC</RootNamespace>
-    <AssemblyName>CD67.ModeleMVC.MVC</AssemblyName>
+    <RootNamespace>CD67.FicheCollege.MVC</RootNamespace>
+    <AssemblyName>CD67.FicheCollege.MVC</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
@@ -46,11 +46,11 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -66,14 +66,6 @@
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Oracle.ManagedDataAccess.12.2.1100\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess.EntityFramework, Version=6.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Oracle.ManagedDataAccess.EntityFramework.12.2.1100\lib\net45\Oracle.ManagedDataAccess.EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="SolrTools, Version=1.6.14.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\PIMP\CD67.PIMP.Solr\bin\debug\SolrTools.dll</HintPath>
@@ -161,10 +153,6 @@
   <ItemGroup>
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\PrintTestController.cs" />
-    <Compile Include="Controllers\RechercheController.cs" />
-    <Compile Include="Controllers\TypeVikingController.cs" />
-    <Compile Include="Controllers\VikingController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
@@ -310,16 +298,6 @@
     <Content Include="Views\Shared\DisplayTemplates\YesNoInt.cshtml" />
     <Content Include="Views\Shared\EditorTemplates\YesNoInt.cshtml" />
     <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Views\TypeViking\Create.cshtml" />
-    <Content Include="Views\TypeViking\Delete.cshtml" />
-    <Content Include="Views\TypeViking\Details.cshtml" />
-    <Content Include="Views\TypeViking\Edit.cshtml" />
-    <Content Include="Views\TypeViking\Index.cshtml" />
-    <Content Include="Views\Viking\Create.cshtml" />
-    <Content Include="Views\Viking\Delete.cshtml" />
-    <Content Include="Views\Viking\Details.cshtml" />
-    <Content Include="Views\Viking\Edit.cshtml" />
-    <Content Include="Views\Viking\Index.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\YesNoBool.cshtml" />
     <Content Include="Views\Shared\EditorTemplates\YesNoBool.cshtml" />
     <Content Include="Views\_ViewStart.cshtml" />
@@ -332,9 +310,7 @@
     <Content Include="Views\Shared\DisplayTemplates\CanonicalHelperModel.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\Date.cshtml" />
     <Content Include="Views\Shared\EditorTemplates\Date.cshtml" />
-    <Content Include="Views\PrintTest\Index.cshtml" />
     <Content Include="Views\Shared\_Flash.cshtml" />
-    <Content Include="Views\Recherche\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
@@ -345,17 +321,13 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CD67.ModeleMVC.Entity\CD67.ModeleMVC.Entity.csproj">
+    <ProjectReference Include="..\CD67.FicheCollege.Entity\CD67.FicheCollege.Entity.csproj">
       <Project>{5bdb34b4-4387-4af7-b388-37d4907dde39}</Project>
-      <Name>CD67.ModeleMVC.Entity</Name>
+      <Name>CD67.FicheCollege.Entity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CD67.ModeleMVC.Factory\CD67.ModeleMVC.Factory.csproj">
+    <ProjectReference Include="..\CD67.FicheCollege.Factory\CD67.FicheCollege.Factory.csproj">
       <Project>{6b7ef24a-1af8-44fb-a290-e42f01ff8812}</Project>
-      <Name>CD67.ModeleMVC.Factory</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\CD67.ModeleMVC.Solr\CD67.ModeleMVC.Solr.csproj">
-      <Project>{9110CF66-3E6B-4803-9C1F-D686A148B04D}</Project>
-      <Name>CD67.ModeleMVC.Solr</Name>
+      <Name>CD67.FicheCollege.Factory</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup>

CD67.ModeleMVC.MVC/Controllers/HomeController.cs → CD67.FicheCollege.MVC/Controllers/HomeController.cs

@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 
-namespace CD67.ModeleMVC.MVC.Controllers
+namespace CD67.FicheCollege.MVC.Controllers
 {
     public class HomeController : Controller
     {

CD67.FicheCollege.MVC/Global.asax

@@ -0,0 +1 @@
+<%@ Application Codebehind="Global.asax.cs" Inherits="CD67.FicheCollege.MVC.MvcApplication" Language="C#" %>

CD67.ModeleMVC.MVC/Global.asax.cs → CD67.FicheCollege.MVC/Global.asax.cs

@@ -7,7 +7,7 @@ using System.Web.Mvc;
 using System.Web.Optimization;
 using System.Web.Routing;
 
-namespace CD67.ModeleMVC.MVC
+namespace CD67.FicheCollege.MVC
 {
     // Remarque : pour obtenir des instructions sur l'activation du mode classique IIS6 ou IIS7, 
     // visitez http://go.microsoft.com/?LinkId=9394801

CD67.ModeleMVC.MVC/Internal/FlashMessageExtensions.cs → CD67.FicheCollege.MVC/Internal/FlashMessageExtensions.cs

@@ -1,7 +1,7 @@
 using System.Web;
 using System.Web.Mvc;
 
-namespace CD67.ModeleMVC.MVC.Internal
+namespace CD67.FicheCollege.MVC.Internal
 {
     internal static class FlashMessageExtensions
     {

CD67.ModeleMVC.MVC/Internal/MvcHtmlHelpers.cs → CD67.FicheCollege.MVC/Internal/MvcHtmlHelpers.cs

@@ -2,7 +2,7 @@
 using System.Linq.Expressions;
 using System.Web.Mvc;
 
-namespace CD67.ModeleMVC.MVC
+namespace CD67.FicheCollege.MVC
 {
     public static class MvcHtmlHelpers
     {

CD67.ModeleMVC.MVC/Internal/Navigation.cs → CD67.FicheCollege.MVC/Internal/Navigation.cs

@@ -5,7 +5,7 @@ using System.Xml;
 using System.Xml.Linq;
 
 
-namespace CD67.ModeleMVC.MVC.Internal
+namespace CD67.FicheCollege.MVC.Internal
 {
     public static class Navigation
     {

CD67.ModeleMVC.MVC/Internal/UtilisateurConnecteFactory.cs → CD67.FicheCollege.MVC/Internal/UtilisateurConnecteFactory.cs

@@ -1,8 +1,11 @@
 using System;
+using System.Collections.Generic;
 using System.DirectoryServices;
+using System.Linq;
+using System.Text.RegularExpressions;
 using System.Web;
 
-namespace CD67.ModeleMVC.MVC.Internal
+namespace CD67.FicheCollege.MVC.Internal
 { 
     public static class UtilisateurConnecteFactory
     {
@@ -31,8 +34,9 @@ namespace CD67.ModeleMVC.MVC.Internal
                         email = userEntry.Properties["mail"].Value.ToString(),
                         login = userEntry.Properties["sAMAccountName"].Value.ToString(),
                         employeeID = userEntry.Properties["employeeID"].Value == null ? (int?)null : int.Parse(userEntry.Properties["employeeID"].Value.ToString()),
-                        guid = userEntry.Properties["objectGUID"].Value as Guid?,
-                        sid = userEntry.Properties["objectSid"].Value.ToString()
+                        guid = userEntry.Properties["objectGUID"].Value == null ? (Guid?)null : new Guid((byte[])userEntry.Properties["objectGUID"].Value),
+                        sid = userEntry.Properties["objectSid"].Value.ToString(),
+                        structure = String.Join(@"\", getOUs(userEntry))
                     };
                     HttpContext.Current.Session["UtilisateurConnecte"] = utilisateurConnecte;
                 }
@@ -75,5 +79,13 @@ namespace CD67.ModeleMVC.MVC.Internal
                 throw new Exception("Erreur dans la récupération des infos de l'utilisateur.", ex);
             }
         }
+
+        public static List<string> getOUs(DirectoryEntry dirEntry)
+        {
+            List<string> res = Regex.Matches(dirEntry.Path, @"OU=[^,]+").Cast<Match>().Select(match => match.Value.Substring(3)).ToList();
+            res.Reverse();
+            res.RemoveAt(0); //Suppression du premier niveau "Organisation"
+            return res;
+        }
     }
 }

CD67.ModeleMVC.MVC/Models/UtilisateurConnecte.cs → CD67.FicheCollege.MVC/Models/UtilisateurConnecte.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 
-namespace CD67.ModeleMVC.MVC.Models
+namespace CD67.FicheCollege.MVC.Models
 {
     /// <summary>
     /// Classe correspondant à l'utilisateur actuelement connecté à l'application
@@ -18,5 +18,6 @@ namespace CD67.ModeleMVC.MVC.Models
         public int? employeeID { get; set; }
         public Guid? guid { get; set; }
         public string sid { get; set; }
+        public string structure { get; set; }
     }
 }

CD67.FicheCollege.MVC/Mvc.sitemap

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<mvcSiteMap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns="http://mvcsitemap.codeplex.com/schemas/MvcSiteMap-File-3.0"
+            xsi:schemaLocation="http://mvcsitemap.codeplex.com/schemas/MvcSiteMap-File-3.0 MvcSiteMapSchema.xsd"
+            enableLocalization="true">
+
+  <mvcSiteMapNode title="Accueil" controller="Home" action="Index">
+    
+  </mvcSiteMapNode>
+
+</mvcSiteMap>

CD67.ModeleMVC.MVC/Properties/AssemblyInfo.cs → CD67.FicheCollege.MVC/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // Les informations générales relatives à un assembly dépendent de 
 // l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations
 // associées à un assembly.
-[assembly: AssemblyTitle("CD67.ModeleMVC.MVC")]
+[assembly: AssemblyTitle("CD67.FicheCollege.MVC")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Conseil Départemental du Bas-Rhin")]
-[assembly: AssemblyProduct("CD67.ModeleMVC.MVC")]
+[assembly: AssemblyProduct("CD67.FicheCollege.MVC")]
 [assembly: AssemblyCopyright("Copyright © Conseil Départemental du Bas-Rhin 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]