PickerAgent: Maj du MCD

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

@@ -62,17 +62,23 @@
     <Folder Include="Properties" />
     <Folder Include="dbo\" />
     <Folder Include="dbo\Tables\" />
+    <Folder Include="Security\" />
   </ItemGroup>
   <ItemGroup>
+    <Build Include="dbo\Tables\ActionsEdu.sql" />
     <Build Include="dbo\Tables\TypesCollege.sql" />
     <Build Include="dbo\Tables\Territoires.sql" />
-    <Build Include="dbo\Tables\Colleges.sql" />
     <Build Include="dbo\Tables\Identites.sql" />
     <Build Include="dbo\Tables\Annees.sql" />
     <Build Include="dbo\Tables\ActionEduAxes.sql" />
     <Build Include="dbo\Tables\ActionEduThematiques.sql" />
-    <Build Include="dbo\Tables\ActionsEdu.sql" />
     <Build Include="dbo\Tables\ActionsEduColleges.sql" />
     <Build Include="dbo\Tables\ActionEduMissions.sql" />
+    <Build Include="dbo\Tables\Colleges.sql" />
+    <Build Include="Security\FicheCollege_Admin.sql" />
+    <Build Include="Security\FicheCollege_Admin_1.sql" />
+    <Build Include="Security\FicheCollege_UserRO.sql" />
+    <Build Include="Security\FicheCollege_UserRW.sql" />
+    <Build Include="Security\RoleMemberships.sql" />
   </ItemGroup>
 </Project>

CD67.FicheCollege.BDD/Security/FicheCollege_Admin.sql

@@ -0,0 +1,2 @@
+CREATE USER [FicheCollege_Admin] FOR LOGIN [FicheCollege_Admin];
+

CD67.FicheCollege.BDD/Security/FicheCollege_Admin_1.sql

@@ -0,0 +1,3 @@
+CREATE LOGIN [FicheCollege_Admin]
+    WITH PASSWORD = N'fgc?Faifg&dUlldnvxno|flkmsFT7_&#$!~<t|g9rHabi{aw', SID = 0x1929F35F0DA6274882652B14192B475D, DEFAULT_LANGUAGE = [us_english], CHECK_POLICY = OFF;
+

CD67.FicheCollege.BDD/Security/FicheCollege_UserRO.sql

@@ -0,0 +1,2 @@
+CREATE USER [FicheCollege_UserRO] FOR LOGIN [FicheCollege_UserRO];
+

CD67.FicheCollege.BDD/Security/FicheCollege_UserRW.sql

@@ -0,0 +1,2 @@
+CREATE USER [FicheCollege_UserRW] FOR LOGIN [FicheCollege_UserRW];
+

CD67.FicheCollege.BDD/Security/RoleMemberships.sql

@@ -0,0 +1,14 @@
+ALTER ROLE [db_owner] ADD MEMBER [FicheCollege_Admin];
+
+
+GO
+ALTER ROLE [db_datareader] ADD MEMBER [FicheCollege_UserRO];
+
+
+GO
+ALTER ROLE [db_datareader] ADD MEMBER [FicheCollege_UserRW];
+
+
+GO
+ALTER ROLE [db_datawriter] ADD MEMBER [FicheCollege_UserRW];
+

CD67.FicheCollege.BDD/dbo/Tables/ActionsEdu.sql

@@ -2,6 +2,7 @@
     [Id]                    INT            IDENTITY (1, 1) NOT NULL,
     [Numero]                NVARCHAR (MAX) NOT NULL,
     [Nom]                   NVARCHAR (MAX) NOT NULL,
+    [Montant]               DECIMAL (18)   CONSTRAINT [DF_ActionsEdu_Montant] DEFAULT ((0)) NOT NULL,
     [Description]           NVARCHAR (MAX) NULL,
     [Neutralise]            BIT            NOT NULL,
     [Ordre]                 INT            NOT NULL,

CD67.FicheCollege.BDD/dbo/Tables/ActionsEduColleges.sql

@@ -3,7 +3,6 @@
     [CommentaireInterne]     NVARCHAR (MAX) NULL,
     [CommentairePublic]      NVARCHAR (MAX) NULL,
     [NbEleves]               BIGINT         NOT NULL,
-    [Montant]                BIGINT         NOT NULL,
     [TiersAstre_Code]        NVARCHAR (MAX) NULL,
     [TiersAstre_Nom]         NVARCHAR (MAX) NULL,
     [TiersAstre_CodeFamille] NVARCHAR (MAX) NULL,

CD67.FicheCollege.BDD/dbo/Tables/Colleges.sql

@@ -1,20 +1,24 @@
 CREATE TABLE [dbo].[Colleges] (
-    [Id]             INT            IDENTITY (1, 1) NOT NULL,
-    [Annee_Id]       INT            NOT NULL,
-    [CodeRne]        NVARCHAR (10)  NOT NULL,
-    [Libelle]        NVARCHAR (255) NOT NULL,
-    [Adresse]        NVARCHAR (255) NULL,
-    [Code_Postal]    NVARCHAR (5)   NULL,
-    [TypeCollege_Id] INT            NOT NULL,
-    [Commune_Insee]  NVARCHAR (5)   NULL,
-    [Commune]        NVARCHAR (255) NOT NULL,
-    [Canton]         NVARCHAR (255) NULL,
-    [Territoire_Id]  NVARCHAR (10)  NULL,
-    [TAD]            NVARCHAR (255) NULL,
-    [CDC]            NVARCHAR (255) NULL,
-    [Tel]            NVARCHAR (255) NULL,
-    [Fax]            NVARCHAR (255) NULL,
-    [Email]          NVARCHAR (255) NULL,
+    [Id]               INT            IDENTITY (1, 1) NOT NULL,
+    [Annee_Id]         INT            NOT NULL,
+    [CodeRne]          NVARCHAR (10)  NOT NULL,
+    [Libelle]          NVARCHAR (255) NOT NULL,
+    [Adresse]          NVARCHAR (255) NULL,
+    [Code_Postal]      NVARCHAR (5)   NULL,
+    [TypeCollege_Id]   INT            NOT NULL,
+    [Commune_Insee]    NVARCHAR (5)   NULL,
+    [Commune]          NVARCHAR (255) NOT NULL,
+    [Canton]           NVARCHAR (255) NULL,
+    [Territoire_Id]    NVARCHAR (10)  NULL,
+    [TAD]              NVARCHAR (255) NULL,
+    [CDC]              NVARCHAR (255) NULL,
+    [Tel]              NVARCHAR (255) NULL,
+    [Fax]              NVARCHAR (255) NULL,
+    [Email]            NVARCHAR (255) NULL,
+    [PrincipalSid]     NVARCHAR (64)  NULL,
+    [AdjointSid]       NVARCHAR (64)  NULL,
+    [Gestionnaire1Sid] NVARCHAR (64)  NULL,
+    [Gestionnaire2Sid] NVARCHAR (64)  NULL,
     CONSTRAINT [PK_Colleges] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_AnneeCollege] FOREIGN KEY ([Annee_Id]) REFERENCES [dbo].[Annees] ([Id]),
     CONSTRAINT [FK_Colleges_Territoires] FOREIGN KEY ([Territoire_Id]) REFERENCES [dbo].[Territoires] ([Id]),

CD67.FicheCollege.Entity/CD67.FicheCollege.Entity.csproj

@@ -99,14 +99,10 @@
     <Compile Include="Extend\Annee.cs" />
     <Compile Include="Extend\College.cs" />
     <Compile Include="Extend\Territoire.cs" />
-    <Compile Include="Extend\Identite.cs" />
     <Compile Include="Extend\ActionEduAxe.cs" />
     <Compile Include="Extend\ActionEduThematique.cs" />
     <Compile Include="Extend\ActionEdu.cs" />
     <Compile Include="Extend\TypeCollege.cs" />
-    <Compile Include="Identite.cs">
-      <DependentUpon>EntityModel.tt</DependentUpon>
-    </Compile>
     <Compile Include="Internal\Entities.cs" />
     <Compile Include="Internal\FormattedDbEntityValidationException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

CD67.FicheCollege.Entity/College.cs

@@ -36,10 +36,13 @@ namespace CD67.FicheCollege.Entity
         public string Tel { get; set; }
         public string Fax { get; set; }
         public string Email { get; set; }
+        public string PrincipalSid { get; set; }
+        public string AdjointSid { get; set; }
+        public string Gestionnaire1Sid { get; set; }
+        public string Gestionnaire2Sid { get; set; }
     
         public virtual Territoire Territoire { get; set; }
         public virtual TypeCollege TypeCollege { get; set; }
-        public virtual Identite Identite { get; set; }
         public virtual Annee Annee { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<ActionEduCollege> ActionsEduColleges { get; set; }

CD67.FicheCollege.Entity/EntityModel.Context.cs

@@ -28,7 +28,6 @@ namespace CD67.FicheCollege.Entity
         public virtual DbSet<TypeCollege> TypesCollege { get; set; }
         public virtual DbSet<Territoire> Territoires { get; set; }
         public virtual DbSet<College> Colleges { get; set; }
-        public virtual DbSet<Identite> Identites { get; set; }
         public virtual DbSet<Annee> Annees { get; set; }
         public virtual DbSet<ActionEduAxe> ActionEduAxes { get; set; }
         public virtual DbSet<ActionEduThematique> ActionEduThematiques { get; set; }

CD67.FicheCollege.Entity/EntityModel.edmx

@@ -90,40 +90,10 @@
           <Property Name="Tel" Type="nvarchar" MaxLength="255" />
           <Property Name="Fax" Type="nvarchar" MaxLength="255" />
           <Property Name="Email" Type="nvarchar" MaxLength="255" />
-        </EntityType>
-        <EntityType Name="Identites">
-          <Key>
-            <PropertyRef Name="College_Id" />
-          </Key>
-          <Property Name="College_Id" Type="int" Nullable="false" />
-          <Property Name="Principal_SID" Type="nvarchar" MaxLength="64" />
-          <Property Name="Principal_Login" Type="nvarchar" MaxLength="255" />
-          <Property Name="Principal_Nom" Type="nvarchar" MaxLength="255" />
-          <Property Name="Principal_Prenom" Type="nvarchar" MaxLength="255" />
-          <Property Name="Principal_Email" Type="nvarchar" MaxLength="255" />
-          <Property Name="Principal_Tel" Type="nvarchar" MaxLength="255" />
-          <Property Name="Principal_Structure" Type="nvarchar" MaxLength="255" />
-          <Property Name="Adjoint_SID" Type="nvarchar" MaxLength="64" />
-          <Property Name="Adjoint_Login" Type="nvarchar" MaxLength="255" />
-          <Property Name="Adjoint_Nom" Type="nvarchar" MaxLength="255" />
-          <Property Name="Adjoint_Prenom" Type="nvarchar" MaxLength="255" />
-          <Property Name="Adjoint_Email" Type="nvarchar" MaxLength="255" />
-          <Property Name="Adjoint_Tel" Type="nvarchar" MaxLength="255" />
-          <Property Name="Adjoint_Structure" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire_SID" Type="nvarchar" MaxLength="64" />
-          <Property Name="Gestionnaire_Login" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire_Nom" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire_Prenom" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire_Email" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire_Tel" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire_Structure" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire2_SID" Type="nvarchar" MaxLength="64" />
-          <Property Name="Gestionnaire2_Login" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire2_Nom" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire2_Prenom" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire2_Email" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire2_Tel" Type="nvarchar" MaxLength="255" />
-          <Property Name="Gestionnaire2_Structure" Type="nvarchar" MaxLength="255" />
+          <Property Name="PrincipalSid" Type="nvarchar" MaxLength="64" />
+          <Property Name="AdjointSid" Type="nvarchar" MaxLength="64" />
+          <Property Name="Gestionnaire1Sid" Type="nvarchar" MaxLength="64" />
+          <Property Name="Gestionnaire2Sid" Type="nvarchar" MaxLength="64" />
         </EntityType>
         <EntityType Name="Territoires">
           <Key>
@@ -255,18 +225,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_FicheIdentite_College">
-          <End Role="Colleges" Type="Self.Colleges" Multiplicity="1" />
-          <End Role="Identites" Type="Self.Identites" Multiplicity="0..1" />
-          <ReferentialConstraint>
-            <Principal Role="Colleges">
-              <PropertyRef Name="Id" />
-            </Principal>
-            <Dependent Role="Identites">
-              <PropertyRef Name="College_Id" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <EntityContainer Name="CD67FicheCollegeStoreContainer">
           <EntitySet Name="ActionEduAxes" EntityType="Self.ActionEduAxes" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ActionEduMissions" EntityType="Self.ActionEduMissions" Schema="dbo" store:Type="Tables" />
@@ -275,7 +233,6 @@
           <EntitySet Name="ActionsEduColleges" EntityType="Self.ActionsEduColleges" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Annees" EntityType="Self.Annees" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Colleges" EntityType="Self.Colleges" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="Identites" EntityType="Self.Identites" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Territoires" EntityType="Self.Territoires" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="TypesCollege" EntityType="Self.TypesCollege" Schema="dbo" store:Type="Tables" />
           <AssociationSet Name="FK_ActionEduAnnee" Association="Self.FK_ActionEduAnnee">
@@ -314,10 +271,6 @@
             <End Role="TypesCollege" EntitySet="TypesCollege" />
             <End Role="Colleges" EntitySet="Colleges" />
           </AssociationSet>
-          <AssociationSet Name="FK_FicheIdentite_College" Association="Self.FK_FicheIdentite_College">
-            <End Role="Colleges" EntitySet="Colleges" />
-            <End Role="Identites" EntitySet="Identites" />
-          </AssociationSet>
         </EntityContainer>
       </Schema></edmx:StorageModels>
     <!-- CSDL content -->
@@ -335,11 +288,6 @@
             <End Role="TypeCollege" EntitySet="TypesCollege" />
             <End Role="College" EntitySet="Colleges" />
           </AssociationSet>
-          <EntitySet Name="Identites" EntityType="CD67.FicheCollege.Identite" />
-          <AssociationSet Name="FK_FicheIdentite_College" Association="CD67.FicheCollege.FK_FicheIdentite_College">
-            <End Role="College" EntitySet="Colleges" />
-            <End Role="Identite" EntitySet="Identites" />
-          </AssociationSet>
           <EntitySet Name="Annees" EntityType="CD67.FicheCollege.Annee" />
           <AssociationSet Name="AnneeCollege" Association="CD67.FicheCollege.AnneeCollege">
             <End Role="Annee" EntitySet="Annees" />
@@ -421,9 +369,12 @@
           <Property Name="Email" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="Territoire" Relationship="CD67.FicheCollege.FK_Colleges_Territoires" FromRole="College" ToRole="Territoire" />
           <NavigationProperty Name="TypeCollege" Relationship="CD67.FicheCollege.FK_Colleges_TypesCollege" FromRole="College" ToRole="TypeCollege" />
-          <NavigationProperty Name="Identite" Relationship="CD67.FicheCollege.FK_FicheIdentite_College" FromRole="College" ToRole="Identite" />
           <NavigationProperty Name="Annee" Relationship="CD67.FicheCollege.AnneeCollege" FromRole="College" ToRole="Annee" />
           <NavigationProperty Name="ActionsEduColleges" Relationship="CD67.FicheCollege.ActionEduCollegeCollege" FromRole="College" ToRole="ActionEduCollege" />
+          <Property Name="PrincipalSid" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
+          <Property Name="AdjointSid" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
+          <Property Name="Gestionnaire1Sid" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
+          <Property Name="Gestionnaire2Sid" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
         </EntityType>
         <Association Name="FK_Colleges_Territoires">
           <End Type="CD67.FicheCollege.Territoire" Role="Territoire" Multiplicity="0..1" />
@@ -449,53 +400,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityType Name="Identite">
-          <Key>
-            <PropertyRef Name="College_Id" />
-          </Key>
-          <Property Name="College_Id" Type="Int32" Nullable="false" />
-          <Property Name="Principal_SID" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
-          <Property Name="Principal_Login" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Principal_Nom" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Principal_Prenom" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Principal_Email" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Principal_Tel" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Principal_Structure" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Adjoint_SID" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
-          <Property Name="Adjoint_Login" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Adjoint_Nom" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Adjoint_Prenom" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Adjoint_Email" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Adjoint_Tel" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Adjoint_Structure" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire_SID" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire_Login" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire_Nom" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire_Prenom" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire_Email" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire_Tel" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire_Structure" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire2_SID" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire2_Login" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire2_Nom" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire2_Prenom" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire2_Email" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire2_Tel" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="Gestionnaire2_Structure" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="College" Relationship="CD67.FicheCollege.FK_FicheIdentite_College" FromRole="Identite" ToRole="College" />
-        </EntityType>
-        <Association Name="FK_FicheIdentite_College">
-          <End Type="CD67.FicheCollege.College" Role="College" Multiplicity="1" />
-          <End Type="CD67.FicheCollege.Identite" Role="Identite" Multiplicity="0..1" />
-          <ReferentialConstraint>
-            <Principal Role="College">
-              <PropertyRef Name="Id" />
-            </Principal>
-            <Dependent Role="Identite">
-              <PropertyRef Name="College_Id" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <EntityType Name="Annee">
           <Key>
             <PropertyRef Name="Id" />
@@ -546,7 +450,7 @@
           <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="Numero" Type="String" Nullable="false" MaxLength="Max" Unicode="true" FixedLength="false" />
           <Property Name="Nom" Type="String" Nullable="false" MaxLength="Max" Unicode="true" FixedLength="false" />
-          <Property Name="Montant" Type="Decimal" Nullable="false" DefaultValue="0" />
+          <Property Name="Montant" Type="Decimal" Nullable="false" DefaultValue="0" Precision="18" Scale="0" />
           <Property Name="Description" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
           <Property Name="Neutralise" Type="Boolean" Nullable="false" />
           <Property Name="Ordre" Type="Int32" Nullable="false" />
@@ -690,7 +594,11 @@
     <EntitySetMapping Name="Colleges">
       <EntityTypeMapping TypeName="IsTypeOf(CD67.FicheCollege.College)">
         <MappingFragment StoreEntitySet="Colleges">
-          <ScalarProperty Name="Id" ColumnName="Id" />
+          <ScalarProperty Name="Gestionnaire2Sid" ColumnName="Gestionnaire2Sid" />
+                <ScalarProperty Name="Gestionnaire1Sid" ColumnName="Gestionnaire1Sid" />
+                <ScalarProperty Name="AdjointSid" ColumnName="AdjointSid" />
+                <ScalarProperty Name="PrincipalSid" ColumnName="PrincipalSid" />
+                <ScalarProperty Name="Id" ColumnName="Id" />
           <ScalarProperty Name="Annee_Id" ColumnName="Annee_Id" />
           <ScalarProperty Name="CodeRne" ColumnName="CodeRne" />
           <ScalarProperty Name="Libelle" ColumnName="Libelle" />
@@ -709,41 +617,6 @@
         </MappingFragment>
       </EntityTypeMapping>
     </EntitySetMapping>
-    <EntitySetMapping Name="Identites">
-      <EntityTypeMapping TypeName="IsTypeOf(CD67.FicheCollege.Identite)">
-        <MappingFragment StoreEntitySet="Identites">
-          <ScalarProperty Name="College_Id" ColumnName="College_Id" />
-          <ScalarProperty Name="Principal_SID" ColumnName="Principal_SID" />
-          <ScalarProperty Name="Principal_Login" ColumnName="Principal_Login" />
-          <ScalarProperty Name="Principal_Nom" ColumnName="Principal_Nom" />
-          <ScalarProperty Name="Principal_Prenom" ColumnName="Principal_Prenom" />
-          <ScalarProperty Name="Principal_Email" ColumnName="Principal_Email" />
-          <ScalarProperty Name="Principal_Tel" ColumnName="Principal_Tel" />
-          <ScalarProperty Name="Principal_Structure" ColumnName="Principal_Structure" />
-          <ScalarProperty Name="Adjoint_SID" ColumnName="Adjoint_SID" />
-          <ScalarProperty Name="Adjoint_Login" ColumnName="Adjoint_Login" />
-          <ScalarProperty Name="Adjoint_Nom" ColumnName="Adjoint_Nom" />
-          <ScalarProperty Name="Adjoint_Prenom" ColumnName="Adjoint_Prenom" />
-          <ScalarProperty Name="Adjoint_Email" ColumnName="Adjoint_Email" />
-          <ScalarProperty Name="Adjoint_Tel" ColumnName="Adjoint_Tel" />
-          <ScalarProperty Name="Adjoint_Structure" ColumnName="Adjoint_Structure" />
-          <ScalarProperty Name="Gestionnaire_SID" ColumnName="Gestionnaire_SID" />
-          <ScalarProperty Name="Gestionnaire_Login" ColumnName="Gestionnaire_Login" />
-          <ScalarProperty Name="Gestionnaire_Nom" ColumnName="Gestionnaire_Nom" />
-          <ScalarProperty Name="Gestionnaire_Prenom" ColumnName="Gestionnaire_Prenom" />
-          <ScalarProperty Name="Gestionnaire_Email" ColumnName="Gestionnaire_Email" />
-          <ScalarProperty Name="Gestionnaire_Tel" ColumnName="Gestionnaire_Tel" />
-          <ScalarProperty Name="Gestionnaire_Structure" ColumnName="Gestionnaire_Structure" />
-          <ScalarProperty Name="Gestionnaire2_SID" ColumnName="Gestionnaire2_SID" />
-          <ScalarProperty Name="Gestionnaire2_Login" ColumnName="Gestionnaire2_Login" />
-          <ScalarProperty Name="Gestionnaire2_Nom" ColumnName="Gestionnaire2_Nom" />
-          <ScalarProperty Name="Gestionnaire2_Prenom" ColumnName="Gestionnaire2_Prenom" />
-          <ScalarProperty Name="Gestionnaire2_Email" ColumnName="Gestionnaire2_Email" />
-          <ScalarProperty Name="Gestionnaire2_Tel" ColumnName="Gestionnaire2_Tel" />
-          <ScalarProperty Name="Gestionnaire2_Structure" ColumnName="Gestionnaire2_Structure" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
     <EntitySetMapping Name="Annees">
       <EntityTypeMapping TypeName="IsTypeOf(CD67.FicheCollege.Annee)">
         <MappingFragment StoreEntitySet="Annees">

CD67.FicheCollege.Entity/EntityModel.edmx.diagram

@@ -10,8 +10,6 @@
         <EntityTypeShape EntityType="CD67.FicheCollege.College" Width="1.75" PointX="3" PointY="2.625" />
         <AssociationConnector Association="CD67.FicheCollege.FK_Colleges_Territoires" />
         <AssociationConnector Association="CD67.FicheCollege.FK_Colleges_TypesCollege" />
-        <EntityTypeShape EntityType="CD67.FicheCollege.Identite" Width="1.875" PointX="2.875" PointY="8" />
-        <AssociationConnector Association="CD67.FicheCollege.FK_FicheIdentite_College" />
         <EntityTypeShape EntityType="CD67.FicheCollege.Annee" Width="1.5" PointX="3" PointY="0.5" />
         <AssociationConnector Association="CD67.FicheCollege.AnneeCollege" />
         <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduAxe" Width="1.5" PointX="12.125" PointY="3.125" />

CD67.FicheCollege.Entity/Extend/College.cs

@@ -67,5 +67,17 @@ namespace CD67.FicheCollege.Entity
 
         [Display(Name = "EMail")]
         public string Email { get; set; }
+
+        [Display(Name = "Principal")]
+        public string PrincipalSid { get; set; }
+
+        [Display(Name = "Adjoint")]
+        public string AdjointSid { get; set; }
+
+        [Display(Name = "Gestionnaire 1")]
+        public string Gestionnaire1Sid { get; set; }
+
+        [Display(Name = "Gestionnaire 2")]
+        public string Gestionnaire2Sid { get; set; }
     }
 }

CD67.FicheCollege.Entity/Extend/Identite.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CD67.FicheCollege.Entity
-{
-    /// <summary>
-    /// Classe d'extension de celle d'Entity, nécessaire pour y associer les Metadata
-    /// </summary>
-    [MetadataType(typeof(Identite_Metadata))]
-    public partial class Identite
-    {
-        public int Id { get { return College_Id; } }
-    }
-
-    /// <summary>
-    /// Classe contenant les DataAnnotations pour chaque champ
-    /// </summary>
-    public class Identite_Metadata
-    {
-    }
-}

CD67.FicheCollege.Entity/Identite.cs

@@ -1,49 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Ce code a été généré à partir d'un modèle.
-//
-//     Des modifications manuelles apportées à ce fichier peuvent conduire à un comportement inattendu de votre application.
-//     Les modifications manuelles apportées à ce fichier sont remplacées si le code est régénéré.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace CD67.FicheCollege.Entity
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Identite
-    {
-        public int College_Id { get; set; }
-        public string Principal_SID { get; set; }
-        public string Principal_Login { get; set; }
-        public string Principal_Nom { get; set; }
-        public string Principal_Prenom { get; set; }
-        public string Principal_Email { get; set; }
-        public string Principal_Tel { get; set; }
-        public string Principal_Structure { get; set; }
-        public string Adjoint_SID { get; set; }
-        public string Adjoint_Login { get; set; }
-        public string Adjoint_Nom { get; set; }
-        public string Adjoint_Prenom { get; set; }
-        public string Adjoint_Email { get; set; }
-        public string Adjoint_Tel { get; set; }
-        public string Adjoint_Structure { get; set; }
-        public string Gestionnaire_SID { get; set; }
-        public string Gestionnaire_Login { get; set; }
-        public string Gestionnaire_Nom { get; set; }
-        public string Gestionnaire_Prenom { get; set; }
-        public string Gestionnaire_Email { get; set; }
-        public string Gestionnaire_Tel { get; set; }
-        public string Gestionnaire_Structure { get; set; }
-        public string Gestionnaire2_SID { get; set; }
-        public string Gestionnaire2_Login { get; set; }
-        public string Gestionnaire2_Nom { get; set; }
-        public string Gestionnaire2_Prenom { get; set; }
-        public string Gestionnaire2_Email { get; set; }
-        public string Gestionnaire2_Tel { get; set; }
-        public string Gestionnaire2_Structure { get; set; }
-    
-        public virtual College College { get; set; }
-    }
-}