#33 et #36: maj MCD

CD67.FicheCollege.Entity/ActionEdu.cs

@@ -18,6 +18,7 @@ namespace CD67.FicheCollege.Entity
         public ActionEdu()
         {
             this.ActionsEduColleges = new HashSet<ActionEduCollege>();
+            this.ActionEduActeurs = new HashSet<ActionEduActeur>();
         }
     
         public int Id { get; set; }
@@ -33,10 +34,14 @@ namespace CD67.FicheCollege.Entity
         public int ActionEduThematiqueId { get; set; }
         public int AnneeId { get; set; }
         public System.Guid TokenId { get; set; }
+        public int StatutId { get; set; }
     
         public virtual ActionEduThematique ActionEduThematique { get; set; }
         public virtual Annee Annee { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<ActionEduCollege> ActionsEduColleges { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<ActionEduActeur> ActionEduActeurs { get; set; }
+        public virtual ActionEduStatut ActionEduStatut { get; set; }
     }
 }

CD67.FicheCollege.Entity/ActionEduActeur.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <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 ActionEduActeur
+    {
+        public int Id { get; set; }
+        public string Nom { get; set; }
+        public string Sid { get; set; }
+        public int RoleId { get; set; }
+        public int ActionEduId { get; set; }
+    
+        public virtual ActionEdu ActionsEdu { get; set; }
+    }
+}

CD67.FicheCollege.Entity/ActionEduStatut.cs

@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <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 ActionEduStatut
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public ActionEduStatut()
+        {
+            this.ActionsEdus = new HashSet<ActionEdu>();
+        }
+    
+        public int Id { get; set; }
+        public string Nom { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<ActionEdu> ActionsEdus { get; set; }
+    }
+}

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

@@ -84,6 +84,9 @@
     <Compile Include="ActionEdu.cs">
       <DependentUpon>EntityModel.tt</DependentUpon>
     </Compile>
+    <Compile Include="ActionEduActeur.cs">
+      <DependentUpon>EntityModel.tt</DependentUpon>
+    </Compile>
     <Compile Include="ActionEduAxe.cs">
       <DependentUpon>EntityModel.tt</DependentUpon>
     </Compile>
@@ -93,6 +96,9 @@
     <Compile Include="ActionEduMission.cs">
       <DependentUpon>EntityModel.tt</DependentUpon>
     </Compile>
+    <Compile Include="ActionEduStatut.cs">
+      <DependentUpon>EntityModel.tt</DependentUpon>
+    </Compile>
     <Compile Include="ActionEduThematique.cs">
       <DependentUpon>EntityModel.tt</DependentUpon>
     </Compile>

CD67.FicheCollege.Entity/EntityModel.Context.cs

@@ -34,5 +34,7 @@ namespace CD67.FicheCollege.Entity
         public virtual DbSet<ActionEdu> ActionsEdu { get; set; }
         public virtual DbSet<ActionEduCollege> ActionsEduColleges { get; set; }
         public virtual DbSet<ActionEduMission> ActionEduMissions { get; set; }
+        public virtual DbSet<ActionEduActeur> ActionEduActeurs { get; set; }
+        public virtual DbSet<ActionEduStatut> ActionEduStatuts { get; set; }
     }
 }

CD67.FicheCollege.Entity/EntityModel.edmx

@@ -5,6 +5,16 @@
     <!-- SSDL content -->
     <edmx:StorageModels>
     <Schema Namespace="CD67.FicheCollege.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+        <EntityType Name="ActionEduActeurs">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Nom" Type="varchar(max)" Nullable="false" />
+          <Property Name="Sid" Type="nvarchar" MaxLength="7" />
+          <Property Name="RoleId" Type="int" Nullable="false" />
+          <Property Name="ActionEduId" Type="int" Nullable="false" />
+        </EntityType>
         <EntityType Name="ActionEduAxes">
           <Key>
             <PropertyRef Name="Id" />
@@ -24,6 +34,13 @@
           <Property Name="Description" Type="nvarchar(max)" />
           <Property Name="ActionEduCollegeId" Type="int" Nullable="false" />
         </EntityType>
+        <EntityType Name="ActionEduStatuts">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" Nullable="false" />
+          <Property Name="Nom" Type="varchar" MaxLength="50" Nullable="false" />
+        </EntityType>
         <EntityType Name="ActionEduThematiques">
           <Key>
             <PropertyRef Name="Id" />
@@ -49,6 +66,7 @@
           <Property Name="Neutralise" Type="bit" Nullable="false" />
           <Property Name="Ordre" Type="int" Nullable="false" />
           <Property Name="ActionEduThematiqueId" Type="int" Nullable="false" />
+          <Property Name="StatutId" Type="int" Nullable="false" />
           <Property Name="AnneeId" Type="int" Nullable="false" />
           <Property Name="TokenId" Type="uniqueidentifier" Nullable="false" />
         </EntityType>
@@ -118,6 +136,18 @@
           <Property Name="Libelle" Type="nvarchar" MaxLength="255" Nullable="false" />
           <Property Name="Ordre" Type="int" Nullable="false" />
         </EntityType>
+        <Association Name="FK_ActionEduActionEduActeur">
+          <End Role="ActionsEdu" Type="Self.ActionsEdu" Multiplicity="1" />
+          <End Role="ActionEduActeurs" Type="Self.ActionEduActeurs" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ActionsEdu">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionEduActeurs">
+              <PropertyRef Name="ActionEduId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_ActionEduAnnee">
           <End Role="Annees" Type="Self.Annees" Multiplicity="1" />
           <End Role="ActionsEdu" Type="Self.ActionsEdu" Multiplicity="*" />
@@ -190,6 +220,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_ActionsEdu_ActionEduStatuts">
+          <End Role="ActionEduStatuts" Type="Self.ActionEduStatuts" Multiplicity="1" />
+          <End Role="ActionsEdu" Type="Self.ActionsEdu" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ActionEduStatuts">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionsEdu">
+              <PropertyRef Name="StatutId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_AnneeCollege">
           <End Role="Annees" Type="Self.Annees" Multiplicity="1" />
           <End Role="Colleges" Type="Self.Colleges" Multiplicity="*" />
@@ -227,8 +269,10 @@
           </ReferentialConstraint>
         </Association>
         <EntityContainer Name="CD67FicheCollegeStoreContainer">
+          <EntitySet Name="ActionEduActeurs" EntityType="Self.ActionEduActeurs" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ActionEduAxes" EntityType="Self.ActionEduAxes" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ActionEduMissions" EntityType="Self.ActionEduMissions" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="ActionEduStatuts" EntityType="Self.ActionEduStatuts" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ActionEduThematiques" EntityType="Self.ActionEduThematiques" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ActionsEdu" EntityType="Self.ActionsEdu" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ActionsEduColleges" EntityType="Self.ActionsEduColleges" Schema="dbo" store:Type="Tables" />
@@ -236,6 +280,10 @@
           <EntitySet Name="Colleges" EntityType="Self.Colleges" 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_ActionEduActionEduActeur" Association="Self.FK_ActionEduActionEduActeur">
+            <End Role="ActionsEdu" EntitySet="ActionsEdu" />
+            <End Role="ActionEduActeurs" EntitySet="ActionEduActeurs" />
+          </AssociationSet>
           <AssociationSet Name="FK_ActionEduAnnee" Association="Self.FK_ActionEduAnnee">
             <End Role="Annees" EntitySet="Annees" />
             <End Role="ActionsEdu" EntitySet="ActionsEdu" />
@@ -260,6 +308,10 @@
             <End Role="ActionEduThematiques" EntitySet="ActionEduThematiques" />
             <End Role="ActionsEdu" EntitySet="ActionsEdu" />
           </AssociationSet>
+          <AssociationSet Name="FK_ActionsEdu_ActionEduStatuts" Association="Self.FK_ActionsEdu_ActionEduStatuts">
+            <End Role="ActionEduStatuts" EntitySet="ActionEduStatuts" />
+            <End Role="ActionsEdu" EntitySet="ActionsEdu" />
+          </AssociationSet>
           <AssociationSet Name="FK_AnneeCollege" Association="Self.FK_AnneeCollege">
             <End Role="Annees" EntitySet="Annees" />
             <End Role="Colleges" EntitySet="Colleges" />
@@ -323,6 +375,16 @@
             <End Role="ActionEduCollege" EntitySet="ActionsEduColleges" />
             <End Role="ActionEdu" EntitySet="ActionsEdu" />
           </AssociationSet>
+          <EntitySet Name="ActionEduActeurs" EntityType="CD67.FicheCollege.ActionEduActeur" />
+          <EntitySet Name="ActionEduStatuts" EntityType="CD67.FicheCollege.ActionEduStatut" />
+          <AssociationSet Name="FK_ActionEduActionEduActeur" Association="CD67.FicheCollege.FK_ActionEduActionEduActeur">
+            <End Role="ActionEdu" EntitySet="ActionsEdu" />
+            <End Role="ActionEduActeur" EntitySet="ActionEduActeurs" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ActionsEdu_ActionEduStatuts" Association="CD67.FicheCollege.FK_ActionsEdu_ActionEduStatuts">
+            <End Role="ActionEduStatut1" EntitySet="ActionEduStatuts" />
+            <End Role="ActionEdu" EntitySet="ActionsEdu" />
+          </AssociationSet>
           </EntityContainer>
         <EntityType Name="TypeCollege">
           <Key>
@@ -466,6 +528,9 @@
           <Property Name="AnneeId" Type="Int32" Nullable="false" />
           <NavigationProperty Name="ActionsEduColleges" Relationship="CD67.FicheCollege.ActionEduCollegeActionEdu" FromRole="ActionEdu" ToRole="ActionEduCollege" />
           <Property Name="TokenId" Type="Guid" Nullable="false" />
+          <Property Name="StatutId" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="ActionEduActeurs" Relationship="CD67.FicheCollege.FK_ActionEduActionEduActeur" FromRole="ActionEdu" ToRole="ActionEduActeur" />
+          <NavigationProperty Name="ActionEduStatut" Relationship="CD67.FicheCollege.FK_ActionsEdu_ActionEduStatuts" FromRole="ActionEdu" ToRole="ActionEduStatut1" />
         </EntityType>
         <Association Name="ActionEduAxeActionEduThematique">
           <End Type="CD67.FicheCollege.ActionEduAxe" Role="ActionEduAxe" Multiplicity="1" />
@@ -563,6 +628,49 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <EntityType Name="ActionEduActeur">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="Nom" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="Sid" Type="String" MaxLength="7" FixedLength="false" Unicode="true" />
+          <Property Name="RoleId" Type="Int32" Nullable="false" />
+          <Property Name="ActionEduId" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="ActionsEdu" Relationship="CD67.FicheCollege.FK_ActionEduActionEduActeur" FromRole="ActionEduActeur" ToRole="ActionEdu" />
+        </EntityType>
+        <EntityType Name="ActionEduStatut">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="Int32" Nullable="false" />
+          <Property Name="Nom" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="ActionsEdus" Relationship="CD67.FicheCollege.FK_ActionsEdu_ActionEduStatuts" FromRole="ActionEduStatut1" ToRole="ActionEdu" />
+        </EntityType>
+        <Association Name="FK_ActionEduActionEduActeur">
+          <End Type="CD67.FicheCollege.ActionEdu" Role="ActionEdu" Multiplicity="1" />
+          <End Type="CD67.FicheCollege.ActionEduActeur" Role="ActionEduActeur" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ActionEdu">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionEduActeur">
+              <PropertyRef Name="ActionEduId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ActionsEdu_ActionEduStatuts">
+          <End Type="CD67.FicheCollege.ActionEduStatut" Role="ActionEduStatut1" Multiplicity="1" />
+          <End Type="CD67.FicheCollege.ActionEdu" Role="ActionEdu" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ActionEduStatut1">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionEdu">
+              <PropertyRef Name="StatutId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -653,6 +761,7 @@
     <EntitySetMapping Name="ActionsEdu">
       <EntityTypeMapping TypeName="IsTypeOf(CD67.FicheCollege.ActionEdu)">
         <MappingFragment StoreEntitySet="ActionsEdu">
+                <ScalarProperty Name="StatutId" ColumnName="StatutId" />
                 <ScalarProperty Name="TokenId" ColumnName="TokenId" />
                 <ScalarProperty Name="CommentairePublic" ColumnName="CommentairePublic" />
                 <ScalarProperty Name="CommentaireInterne" ColumnName="CommentaireInterne" />
@@ -691,7 +800,26 @@
         </MappingFragment>
       </EntityTypeMapping>
     </EntitySetMapping>
-  </EntityContainerMapping>
+          <EntitySetMapping Name="ActionEduActeurs">
+            <EntityTypeMapping TypeName="CD67.FicheCollege.ActionEduActeur">
+              <MappingFragment StoreEntitySet="ActionEduActeurs">
+                <ScalarProperty Name="ActionEduId" ColumnName="ActionEduId" />
+                <ScalarProperty Name="RoleId" ColumnName="RoleId" />
+                <ScalarProperty Name="Sid" ColumnName="Sid" />
+                <ScalarProperty Name="Nom" ColumnName="Nom" />
+                <ScalarProperty Name="Id" ColumnName="Id" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="ActionEduStatuts">
+            <EntityTypeMapping TypeName="CD67.FicheCollege.ActionEduStatut">
+              <MappingFragment StoreEntitySet="ActionEduStatuts">
+                <ScalarProperty Name="Nom" ColumnName="Nom" />
+                <ScalarProperty Name="Id" ColumnName="Id" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          </EntityContainerMapping>
 </Mapping></edmx:Mappings>
   </edmx:Runtime>
   <!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->

CD67.FicheCollege.Entity/EntityModel.edmx.diagram

@@ -12,17 +12,21 @@
         <AssociationConnector Association="CD67.FicheCollege.FK_Colleges_TypesCollege" />
         <EntityTypeShape EntityType="CD67.FicheCollege.Annee" Width="1.5" PointX="3.125" PointY="0.5" />
         <AssociationConnector Association="CD67.FicheCollege.AnneeCollege" />
-        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduAxe" Width="1.5" PointX="12.125" PointY="3.125" />
-        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduThematique" Width="1.875" PointX="9.875" PointY="3.125" />
-        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEdu" Width="1.5" PointX="8" PointY="3.125" />
+        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduAxe" Width="1.5" PointX="13.125" PointY="2.25" />
+        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduThematique" Width="1.875" PointX="10.875" PointY="2.25" />
+        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEdu" Width="2.125" PointX="8" PointY="3.125" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduAxeActionEduThematique" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduThematiqueActionEdu" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduAnnee" />
         <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduCollege" Width="2.125" PointX="5.25" PointY="3" />
-        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduMission" Width="2.25" PointX="6" PointY="7.375" />
+        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduMission" Width="2.25" PointX="5.25" PointY="6.625" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduCollegeActionEduMission" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduCollegeCollege" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduCollegeActionEdu" />
+        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduActeur" Width="3.125" PointX="11.25" PointY="6.75" />
+        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduStatut" Width="2.5" PointX="11.25" PointY="4.875" />
+        <AssociationConnector Association="CD67.FicheCollege.FK_ActionEduActionEduActeur" />
+        <AssociationConnector Association="CD67.FicheCollege.FK_ActionsEdu_ActionEduStatuts" />
         </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>