Explorar el Código

NEW ActionsEduCollege : CRUD ok

olivier.massot hace 7 años
padre
commit
3c9476f7b4

+ 1 - 1
CD67.FicheCollege.BDD/dbo/Tables/ActionEduMissions.sql

@@ -2,7 +2,7 @@
     [Id]                 INT            IDENTITY (1, 1) NOT NULL,
     [Code]               NVARCHAR (MAX) NOT NULL,
     [Nom]                NVARCHAR (MAX) NOT NULL,
-    [Description]        NVARCHAR (MAX) NOT NULL,
+    [Description]        NVARCHAR (MAX) NULL,
     [ActionEduCollegeId] INT            NOT NULL,
     CONSTRAINT [PK_ActionEduMissions] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_ActionEduCollegeActionEduMission] FOREIGN KEY ([ActionEduCollegeId]) REFERENCES [dbo].[ActionsEduColleges] ([Id])

+ 1 - 1
CD67.FicheCollege.BDD/dbo/Tables/ActionsEdu.sql

@@ -2,7 +2,7 @@
     [Id]                    INT            IDENTITY (1, 1) NOT NULL,
     [Numero]                NVARCHAR (MAX) NOT NULL,
     [Nom]                   NVARCHAR (MAX) NOT NULL,
-    [Description]           NVARCHAR (MAX) NOT NULL,
+    [Description]           NVARCHAR (MAX) NULL,
     [Neutralise]            BIT            NOT NULL,
     [Ordre]                 INT            NOT NULL,
     [ActionEduThematiqueId] INT            NOT NULL,

+ 6 - 6
CD67.FicheCollege.BDD/dbo/Tables/ActionsEduColleges.sql

@@ -1,13 +1,13 @@
 CREATE TABLE [dbo].[ActionsEduColleges] (
     [Id]                     INT            IDENTITY (1, 1) NOT NULL,
-    [CommentaireInterne]     NVARCHAR (MAX) NOT NULL,
-    [CommentairePublic]      NVARCHAR (MAX) NOT NULL,
+    [CommentaireInterne]     NVARCHAR (MAX) NULL,
+    [CommentairePublic]      NVARCHAR (MAX) NULL,
     [NbEleves]               BIGINT         NOT NULL,
     [Montant]                BIGINT         NOT NULL,
-    [TiersAstre_Code]        NVARCHAR (MAX) NOT NULL,
-    [TiersAstre_Nom]         NVARCHAR (MAX) NOT NULL,
-    [TiersAstre_CodeFamille] NVARCHAR (MAX) NOT NULL,
-    [TiersAstre_Description] NVARCHAR (MAX) NOT NULL,
+    [TiersAstre_Code]        NVARCHAR (MAX) NULL,
+    [TiersAstre_Nom]         NVARCHAR (MAX) NULL,
+    [TiersAstre_CodeFamille] NVARCHAR (MAX) NULL,
+    [TiersAstre_Description] NVARCHAR (MAX) NULL,
     [CollegeId]              INT            NOT NULL,
     [ActionEduId]            INT            NOT NULL,
     CONSTRAINT [PK_ActionsEduColleges] PRIMARY KEY CLUSTERED ([Id] ASC),

+ 327 - 327
CD67.FicheCollege.Entity/EntityModel.edmx

@@ -4,322 +4,322 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="CD67.FicheCollege.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="CD67FicheCollegeStoreContainer">
-    <EntitySet Name="TypesCollege" EntityType="CD67.FicheCollege.Store.TypesCollege" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="Territoires" EntityType="CD67.FicheCollege.Store.Territoires" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="Colleges" EntityType="CD67.FicheCollege.Store.Colleges" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="Identites" EntityType="CD67.FicheCollege.Store.Identites" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="Annees" EntityType="CD67.FicheCollege.Store.Annees" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="ActionEduAxes" EntityType="CD67.FicheCollege.Store.ActionEduAxes" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="ActionEduThematiques" EntityType="CD67.FicheCollege.Store.ActionEduThematiques" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="ActionsEdu" EntityType="CD67.FicheCollege.Store.ActionsEdu" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="ActionsEduColleges" EntityType="CD67.FicheCollege.Store.ActionsEduColleges" store:Type="Tables" Schema="dbo" />
-    <EntitySet Name="ActionEduMissions" EntityType="CD67.FicheCollege.Store.ActionEduMissions" store:Type="Tables" Schema="dbo" />
-    <AssociationSet Name="FK_Colleges_Territoires" Association="CD67.FicheCollege.Store.FK_Colleges_Territoires">
-      <End Role="Territoire" EntitySet="Territoires" />
-      <End Role="College" EntitySet="Colleges" />
-    </AssociationSet>
-    <AssociationSet Name="FK_Colleges_TypesCollege" Association="CD67.FicheCollege.Store.FK_Colleges_TypesCollege">
-      <End Role="TypeCollege" EntitySet="TypesCollege" />
-      <End Role="College" EntitySet="Colleges" />
-    </AssociationSet>
-    <AssociationSet Name="FK_FicheIdentite_College" Association="CD67.FicheCollege.Store.FK_FicheIdentite_College">
-      <End Role="College" EntitySet="Colleges" />
-      <End Role="Identite" EntitySet="Identites" />
-    </AssociationSet>
-    <AssociationSet Name="AnneeCollege" Association="CD67.FicheCollege.Store.AnneeCollege">
-      <End Role="Annee" EntitySet="Annees" />
-      <End Role="College" EntitySet="Colleges" />
-    </AssociationSet>
-    <AssociationSet Name="ActionEduAxeActionEduThematique" Association="CD67.FicheCollege.Store.ActionEduAxeActionEduThematique">
-      <End Role="ActionEduAxe" EntitySet="ActionEduAxes" />
-      <End Role="ActionEduThematique" EntitySet="ActionEduThematiques" />
-    </AssociationSet>
-    <AssociationSet Name="ActionEduThematiqueActionEdu" Association="CD67.FicheCollege.Store.ActionEduThematiqueActionEdu">
-      <End Role="ActionEduThematique" EntitySet="ActionEduThematiques" />
-      <End Role="ActionEdu" EntitySet="ActionsEdu" />
-    </AssociationSet>
-    <AssociationSet Name="ActionEduAnnee" Association="CD67.FicheCollege.Store.ActionEduAnnee">
-      <End Role="ActionEdu" EntitySet="ActionsEdu" />
-      <End Role="Annee" EntitySet="Annees" />
-    </AssociationSet>
-    <AssociationSet Name="ActionEduCollegeActionEduMission" Association="CD67.FicheCollege.Store.ActionEduCollegeActionEduMission">
-      <End Role="ActionEduCollege" EntitySet="ActionsEduColleges" />
-      <End Role="ActionEduMission" EntitySet="ActionEduMissions" />
-    </AssociationSet>
-    <AssociationSet Name="ActionEduCollegeCollege" Association="CD67.FicheCollege.Store.ActionEduCollegeCollege">
-      <End Role="ActionEduCollege" EntitySet="ActionsEduColleges" />
-      <End Role="College" EntitySet="Colleges" />
-    </AssociationSet>
-    <AssociationSet Name="ActionEduCollegeActionEdu" Association="CD67.FicheCollege.Store.ActionEduCollegeActionEdu">
-      <End Role="ActionEduCollege" EntitySet="ActionsEduColleges" />
-      <End Role="ActionEdu" EntitySet="ActionsEdu" />
-    </AssociationSet>
-  </EntityContainer>
-  <EntityType Name="TypesCollege">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-    <Property Name="Libelle" Type="nvarchar" Nullable="false" MaxLength="255" />
-    <Property Name="Ordre" Type="int" Nullable="false" />
-  </EntityType>
-  <EntityType Name="Territoires">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="nvarchar" Nullable="false" MaxLength="10" />
-    <Property Name="Libelle" Type="nvarchar" Nullable="false" MaxLength="255" />
-    <Property Name="Referent_SID" Type="nvarchar" Nullable="true" MaxLength="64" />
-    <Property Name="Referent_Nom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Referent_Prenom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Referent_Structure" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Referent_Login" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Referent_Email" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Ordre" Type="int" Nullable="false" />
-  </EntityType>
-  <EntityType Name="Colleges">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="int" Nullable="false" />
-    <Property Name="Annee_Id" Type="int" Nullable="false" />
-    <Property Name="CodeRne" Type="nvarchar" Nullable="false" MaxLength="10" />
-    <Property Name="Libelle" Type="nvarchar" Nullable="false" MaxLength="255" />
-    <Property Name="Adresse" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Code_Postal" Type="nvarchar" Nullable="true" MaxLength="5" />
-    <Property Name="TypeCollege_Id" Type="int" Nullable="false" />
-    <Property Name="Commune_Insee" Type="nvarchar" Nullable="true" MaxLength="5" />
-    <Property Name="Commune" Type="nvarchar" Nullable="false" MaxLength="255" />
-    <Property Name="Canton" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Territoire_Id" Type="nvarchar" Nullable="true" MaxLength="10" />
-    <Property Name="TAD" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="CDC" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Tel" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Fax" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Email" Type="nvarchar" Nullable="true" 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" Nullable="true" MaxLength="64" />
-    <Property Name="Principal_Login" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Principal_Nom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Principal_Prenom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Principal_Email" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Principal_Tel" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Principal_Structure" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Adjoint_SID" Type="nvarchar" Nullable="true" MaxLength="64" />
-    <Property Name="Adjoint_Login" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Adjoint_Nom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Adjoint_Prenom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Adjoint_Email" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Adjoint_Tel" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Adjoint_Structure" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire_SID" Type="nvarchar" Nullable="true" MaxLength="64" />
-    <Property Name="Gestionnaire_Login" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire_Nom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire_Prenom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire_Email" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire_Tel" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire_Structure" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire2_SID" Type="nvarchar" Nullable="true" MaxLength="64" />
-    <Property Name="Gestionnaire2_Login" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire2_Nom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire2_Prenom" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire2_Email" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire2_Tel" Type="nvarchar" Nullable="true" MaxLength="255" />
-    <Property Name="Gestionnaire2_Structure" Type="nvarchar" Nullable="true" MaxLength="255" />
-  </EntityType>
-  <EntityType Name="Annees">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-    <Property Name="Libelle" Type="nvarchar" Nullable="false" MaxLength="12" />
-  </EntityType>
-  <EntityType Name="ActionEduAxes">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-    <Property Name="Nom" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="Neutralise" Type="bit" Nullable="false" DefaultValue="false" />
-    <Property Name="Ordre" Type="int" Nullable="false" />
-  </EntityType>
-  <EntityType Name="ActionEduThematiques">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-    <Property Name="Nom" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="Neutralise" Type="bit" Nullable="false" DefaultValue="false" />
-    <Property Name="Ordre" Type="int" Nullable="false" />
-    <Property Name="ActionEduAxeId" Type="int" Nullable="false" />
-  </EntityType>
-  <EntityType Name="ActionsEdu">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-    <Property Name="Numero" Type="nvarchar(max)" Nullable="false" DefaultValue="0" />
-    <Property Name="Nom" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="Description" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="Neutralise" Type="bit" Nullable="false" />
-    <Property Name="Ordre" Type="int" Nullable="false" />
-    <Property Name="ActionEduThematiqueId" Type="int" Nullable="false" />
-    <Property Name="AnneeId" Type="int" Nullable="false" />
-  </EntityType>
-  <EntityType Name="ActionsEduColleges">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-    <Property Name="CommentaireInterne" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="CommentairePublic" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="NbEleves" Type="bigint" Nullable="false" DefaultValue="0" />
-    <Property Name="Montant" Type="bigint" Nullable="false" DefaultValue="0" />
-    <Property Name="TiersAstre_Code" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="TiersAstre_Nom" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="TiersAstre_CodeFamille" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="TiersAstre_Description" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="CollegeId" Type="int" Nullable="false" />
-    <Property Name="ActionEduId" Type="int" Nullable="false" />
-  </EntityType>
-  <EntityType Name="ActionEduMissions">
-    <Key>
-      <PropertyRef Name="Id" />
-    </Key>
-    <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-    <Property Name="Code" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="Nom" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="Description" Type="nvarchar(max)" Nullable="false" />
-    <Property Name="ActionEduCollegeId" Type="int" Nullable="false" />
-  </EntityType>
-  <Association Name="FK_Colleges_Territoires">
-    <End Role="Territoire" Type="CD67.FicheCollege.Store.Territoires" Multiplicity="0..1" />
-    <End Role="College" Type="CD67.FicheCollege.Store.Colleges" Multiplicity="*" />
-    <ReferentialConstraint>
-      <Principal Role="Territoire">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="College">
-        <PropertyRef Name="Territoire_Id" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="FK_Colleges_TypesCollege">
-    <End Role="TypeCollege" Type="CD67.FicheCollege.Store.TypesCollege" Multiplicity="1" />
-    <End Role="College" Type="CD67.FicheCollege.Store.Colleges" Multiplicity="*" />
-    <ReferentialConstraint>
-      <Principal Role="TypeCollege">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="College">
-        <PropertyRef Name="TypeCollege_Id" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="FK_FicheIdentite_College">
-    <End Role="College" Type="CD67.FicheCollege.Store.Colleges" Multiplicity="1" />
-    <End Role="Identite" Type="CD67.FicheCollege.Store.Identites" Multiplicity="0..1" />
-    <ReferentialConstraint>
-      <Principal Role="College">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="Identite">
-        <PropertyRef Name="College_Id" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="AnneeCollege">
-    <End Role="Annee" Type="CD67.FicheCollege.Store.Annees" Multiplicity="1" />
-    <End Role="College" Type="CD67.FicheCollege.Store.Colleges" Multiplicity="*" />
-    <ReferentialConstraint>
-      <Principal Role="Annee">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="College">
-        <PropertyRef Name="Annee_Id" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="ActionEduAxeActionEduThematique">
-    <End Role="ActionEduAxe" Type="CD67.FicheCollege.Store.ActionEduAxes" Multiplicity="1" />
-    <End Role="ActionEduThematique" Type="CD67.FicheCollege.Store.ActionEduThematiques" Multiplicity="*" />
-    <ReferentialConstraint>
-      <Principal Role="ActionEduAxe">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="ActionEduThematique">
-        <PropertyRef Name="ActionEduAxeId" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="ActionEduThematiqueActionEdu">
-    <End Role="ActionEduThematique" Type="CD67.FicheCollege.Store.ActionEduThematiques" Multiplicity="1" />
-    <End Role="ActionEdu" Type="CD67.FicheCollege.Store.ActionsEdu" Multiplicity="*" />
-    <ReferentialConstraint>
-      <Principal Role="ActionEduThematique">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="ActionEdu">
-        <PropertyRef Name="ActionEduThematiqueId" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="ActionEduAnnee">
-    <End Role="ActionEdu" Type="CD67.FicheCollege.Store.ActionsEdu" Multiplicity="*" />
-    <End Role="Annee" Type="CD67.FicheCollege.Store.Annees" Multiplicity="1" />
-    <ReferentialConstraint>
-      <Principal Role="Annee">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="ActionEdu">
-        <PropertyRef Name="AnneeId" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="ActionEduCollegeActionEduMission">
-    <End Role="ActionEduCollege" Type="CD67.FicheCollege.Store.ActionsEduColleges" Multiplicity="1" />
-    <End Role="ActionEduMission" Type="CD67.FicheCollege.Store.ActionEduMissions" Multiplicity="*" />
-    <ReferentialConstraint>
-      <Principal Role="ActionEduCollege">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="ActionEduMission">
-        <PropertyRef Name="ActionEduCollegeId" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="ActionEduCollegeCollege">
-    <End Role="ActionEduCollege" Type="CD67.FicheCollege.Store.ActionsEduColleges" Multiplicity="*" />
-    <End Role="College" Type="CD67.FicheCollege.Store.Colleges" Multiplicity="1" />
-    <ReferentialConstraint>
-      <Principal Role="College">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="ActionEduCollege">
-        <PropertyRef Name="CollegeId" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-  <Association Name="ActionEduCollegeActionEdu">
-    <End Role="ActionEduCollege" Type="CD67.FicheCollege.Store.ActionsEduColleges" Multiplicity="*" />
-    <End Role="ActionEdu" Type="CD67.FicheCollege.Store.ActionsEdu" Multiplicity="1" />
-    <ReferentialConstraint>
-      <Principal Role="ActionEdu">
-        <PropertyRef Name="Id" />
-      </Principal>
-      <Dependent Role="ActionEduCollege">
-        <PropertyRef Name="ActionEduId" />
-      </Dependent>
-    </ReferentialConstraint>
-  </Association>
-</Schema></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="ActionEduAxes">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Nom" Type="nvarchar(max)" Nullable="false" />
+          <Property Name="Neutralise" Type="bit" Nullable="false" />
+          <Property Name="Ordre" Type="int" Nullable="false" />
+        </EntityType>
+        <EntityType Name="ActionEduMissions">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Code" Type="nvarchar(max)" Nullable="false" />
+          <Property Name="Nom" Type="nvarchar(max)" Nullable="false" />
+          <Property Name="Description" Type="nvarchar(max)" />
+          <Property Name="ActionEduCollegeId" Type="int" Nullable="false" />
+        </EntityType>
+        <EntityType Name="ActionEduThematiques">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Nom" Type="nvarchar(max)" Nullable="false" />
+          <Property Name="Neutralise" Type="bit" Nullable="false" />
+          <Property Name="Ordre" Type="int" Nullable="false" />
+          <Property Name="ActionEduAxeId" Type="int" Nullable="false" />
+        </EntityType>
+        <EntityType Name="ActionsEdu">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Numero" Type="nvarchar(max)" Nullable="false" />
+          <Property Name="Nom" Type="nvarchar(max)" Nullable="false" />
+          <Property Name="Description" Type="nvarchar(max)" />
+          <Property Name="Neutralise" Type="bit" Nullable="false" />
+          <Property Name="Ordre" Type="int" Nullable="false" />
+          <Property Name="ActionEduThematiqueId" Type="int" Nullable="false" />
+          <Property Name="AnneeId" Type="int" Nullable="false" />
+        </EntityType>
+        <EntityType Name="ActionsEduColleges">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="CommentaireInterne" Type="nvarchar(max)" />
+          <Property Name="CommentairePublic" Type="nvarchar(max)" />
+          <Property Name="NbEleves" Type="bigint" Nullable="false" />
+          <Property Name="Montant" Type="bigint" Nullable="false" />
+          <Property Name="TiersAstre_Code" Type="nvarchar(max)" />
+          <Property Name="TiersAstre_Nom" Type="nvarchar(max)" />
+          <Property Name="TiersAstre_CodeFamille" Type="nvarchar(max)" />
+          <Property Name="TiersAstre_Description" Type="nvarchar(max)" />
+          <Property Name="CollegeId" Type="int" Nullable="false" />
+          <Property Name="ActionEduId" Type="int" Nullable="false" />
+        </EntityType>
+        <EntityType Name="Annees">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Libelle" Type="nvarchar" MaxLength="12" Nullable="false" />
+        </EntityType>
+        <EntityType Name="Colleges">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" Nullable="false" />
+          <Property Name="Annee_Id" Type="int" Nullable="false" />
+          <Property Name="CodeRne" Type="nvarchar" MaxLength="10" Nullable="false" />
+          <Property Name="Libelle" Type="nvarchar" MaxLength="255" Nullable="false" />
+          <Property Name="Adresse" Type="nvarchar" MaxLength="255" />
+          <Property Name="Code_Postal" Type="nvarchar" MaxLength="5" />
+          <Property Name="TypeCollege_Id" Type="int" Nullable="false" />
+          <Property Name="Commune_Insee" Type="nvarchar" MaxLength="5" />
+          <Property Name="Commune" Type="nvarchar" MaxLength="255" Nullable="false" />
+          <Property Name="Canton" Type="nvarchar" MaxLength="255" />
+          <Property Name="Territoire_Id" Type="nvarchar" MaxLength="10" />
+          <Property Name="TAD" Type="nvarchar" MaxLength="255" />
+          <Property Name="CDC" Type="nvarchar" MaxLength="255" />
+          <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" />
+        </EntityType>
+        <EntityType Name="Territoires">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="nvarchar" MaxLength="10" Nullable="false" />
+          <Property Name="Libelle" Type="nvarchar" MaxLength="255" Nullable="false" />
+          <Property Name="Referent_SID" Type="nvarchar" MaxLength="64" />
+          <Property Name="Referent_Nom" Type="nvarchar" MaxLength="255" />
+          <Property Name="Referent_Prenom" Type="nvarchar" MaxLength="255" />
+          <Property Name="Referent_Structure" Type="nvarchar" MaxLength="255" />
+          <Property Name="Referent_Login" Type="nvarchar" MaxLength="255" />
+          <Property Name="Referent_Email" Type="nvarchar" MaxLength="255" />
+          <Property Name="Ordre" Type="int" Nullable="false" />
+        </EntityType>
+        <EntityType Name="TypesCollege">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Libelle" Type="nvarchar" MaxLength="255" Nullable="false" />
+          <Property Name="Ordre" Type="int" Nullable="false" />
+        </EntityType>
+        <Association Name="FK_ActionEduAnnee">
+          <End Role="Annees" Type="Self.Annees" Multiplicity="1" />
+          <End Role="ActionsEdu" Type="Self.ActionsEdu" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Annees">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionsEdu">
+              <PropertyRef Name="AnneeId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ActionEduAxeActionEduThematique">
+          <End Role="ActionEduAxes" Type="Self.ActionEduAxes" Multiplicity="1" />
+          <End Role="ActionEduThematiques" Type="Self.ActionEduThematiques" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ActionEduAxes">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionEduThematiques">
+              <PropertyRef Name="ActionEduAxeId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ActionEduCollegeActionEdu">
+          <End Role="ActionsEdu" Type="Self.ActionsEdu" Multiplicity="1" />
+          <End Role="ActionsEduColleges" Type="Self.ActionsEduColleges" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ActionsEdu">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionsEduColleges">
+              <PropertyRef Name="ActionEduId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ActionEduCollegeActionEduMission">
+          <End Role="ActionsEduColleges" Type="Self.ActionsEduColleges" Multiplicity="1" />
+          <End Role="ActionEduMissions" Type="Self.ActionEduMissions" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ActionsEduColleges">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionEduMissions">
+              <PropertyRef Name="ActionEduCollegeId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ActionEduCollegeCollege">
+          <End Role="Colleges" Type="Self.Colleges" Multiplicity="1" />
+          <End Role="ActionsEduColleges" Type="Self.ActionsEduColleges" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Colleges">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionsEduColleges">
+              <PropertyRef Name="CollegeId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ActionEduThematiqueActionEdu">
+          <End Role="ActionEduThematiques" Type="Self.ActionEduThematiques" Multiplicity="1" />
+          <End Role="ActionsEdu" Type="Self.ActionsEdu" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="ActionEduThematiques">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="ActionsEdu">
+              <PropertyRef Name="ActionEduThematiqueId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_AnneeCollege">
+          <End Role="Annees" Type="Self.Annees" Multiplicity="1" />
+          <End Role="Colleges" Type="Self.Colleges" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Annees">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="Colleges">
+              <PropertyRef Name="Annee_Id" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_Colleges_Territoires">
+          <End Role="Territoires" Type="Self.Territoires" Multiplicity="0..1" />
+          <End Role="Colleges" Type="Self.Colleges" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Territoires">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="Colleges">
+              <PropertyRef Name="Territoire_Id" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_Colleges_TypesCollege">
+          <End Role="TypesCollege" Type="Self.TypesCollege" Multiplicity="1" />
+          <End Role="Colleges" Type="Self.Colleges" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="TypesCollege">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="Colleges">
+              <PropertyRef Name="TypeCollege_Id" />
+            </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" />
+          <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" />
+          <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">
+            <End Role="Annees" EntitySet="Annees" />
+            <End Role="ActionsEdu" EntitySet="ActionsEdu" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ActionEduAxeActionEduThematique" Association="Self.FK_ActionEduAxeActionEduThematique">
+            <End Role="ActionEduAxes" EntitySet="ActionEduAxes" />
+            <End Role="ActionEduThematiques" EntitySet="ActionEduThematiques" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ActionEduCollegeActionEdu" Association="Self.FK_ActionEduCollegeActionEdu">
+            <End Role="ActionsEdu" EntitySet="ActionsEdu" />
+            <End Role="ActionsEduColleges" EntitySet="ActionsEduColleges" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ActionEduCollegeActionEduMission" Association="Self.FK_ActionEduCollegeActionEduMission">
+            <End Role="ActionsEduColleges" EntitySet="ActionsEduColleges" />
+            <End Role="ActionEduMissions" EntitySet="ActionEduMissions" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ActionEduCollegeCollege" Association="Self.FK_ActionEduCollegeCollege">
+            <End Role="Colleges" EntitySet="Colleges" />
+            <End Role="ActionsEduColleges" EntitySet="ActionsEduColleges" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ActionEduThematiqueActionEdu" Association="Self.FK_ActionEduThematiqueActionEdu">
+            <End Role="ActionEduThematiques" EntitySet="ActionEduThematiques" />
+            <End Role="ActionsEdu" EntitySet="ActionsEdu" />
+          </AssociationSet>
+          <AssociationSet Name="FK_AnneeCollege" Association="Self.FK_AnneeCollege">
+            <End Role="Annees" EntitySet="Annees" />
+            <End Role="Colleges" EntitySet="Colleges" />
+          </AssociationSet>
+          <AssociationSet Name="FK_Colleges_Territoires" Association="Self.FK_Colleges_Territoires">
+            <End Role="Territoires" EntitySet="Territoires" />
+            <End Role="Colleges" EntitySet="Colleges" />
+          </AssociationSet>
+          <AssociationSet Name="FK_Colleges_TypesCollege" Association="Self.FK_Colleges_TypesCollege">
+            <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 -->
     <edmx:ConceptualModels>
       <Schema Namespace="CD67.FicheCollege" 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">
@@ -544,9 +544,9 @@
             <PropertyRef Name="Id" />
           </Key>
           <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="Numero" Type="String" Nullable="false" DefaultValue="0" />
+          <Property Name="Numero" Type="String" Nullable="false" DefaultValue="0" MaxLength="Max" Unicode="true" FixedLength="false" />
           <Property Name="Nom" Type="String" Nullable="false" MaxLength="Max" Unicode="true" FixedLength="false" />
-          <Property Name="Description" Type="String" Nullable="false" MaxLength="Max" Unicode="true" FixedLength="false" />
+          <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" />
           <NavigationProperty Name="ActionEduThematique" Relationship="CD67.FicheCollege.ActionEduThematiqueActionEdu" FromRole="ActionEdu" ToRole="ActionEduThematique" />
@@ -596,14 +596,14 @@
             <PropertyRef Name="Id" />
           </Key>
           <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="CommentaireInterne" Type="String" Nullable="false" />
-          <Property Name="CommentairePublic" Type="String" Nullable="false" />
+          <Property Name="CommentaireInterne" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
+          <Property Name="CommentairePublic" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
           <Property Name="NbEleves" Type="Int64" Nullable="false" DefaultValue="0" />
           <Property Name="Montant" Type="Int64" Nullable="false" DefaultValue="0" />
-          <Property Name="TiersAstre_Code" Type="String" Nullable="false" />
-          <Property Name="TiersAstre_Nom" Type="String" Nullable="false" />
-          <Property Name="TiersAstre_CodeFamille" Type="String" Nullable="false" />
-          <Property Name="TiersAstre_Description" Type="String" Nullable="false" />
+          <Property Name="TiersAstre_Code" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
+          <Property Name="TiersAstre_Nom" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
+          <Property Name="TiersAstre_CodeFamille" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
+          <Property Name="TiersAstre_Description" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
           <NavigationProperty Name="ActionEduMissions" Relationship="CD67.FicheCollege.ActionEduCollegeActionEduMission" FromRole="ActionEduCollege" ToRole="ActionEduMission" />
           <NavigationProperty Name="College" Relationship="CD67.FicheCollege.ActionEduCollegeCollege" FromRole="ActionEduCollege" ToRole="College" />
           <Property Name="CollegeId" Type="Int32" Nullable="false" />
@@ -615,9 +615,9 @@
             <PropertyRef Name="Id" />
           </Key>
           <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="Code" Type="String" Nullable="false" />
-          <Property Name="Nom" Type="String" Nullable="false" />
-          <Property Name="Description" Type="String" Nullable="false" />
+          <Property Name="Code" 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="Description" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
           <NavigationProperty Name="ActionEduCollege" Relationship="CD67.FicheCollege.ActionEduCollegeActionEduMission" FromRole="ActionEduMission" ToRole="ActionEduCollege" />
           <Property Name="ActionEduCollegeId" Type="Int32" Nullable="false" />
         </EntityType>

+ 20 - 0
CD67.FicheCollege.Entity/Extend/ActionEduCollege.cs

@@ -20,6 +20,26 @@ namespace CD67.FicheCollege.Entity
     /// </summary>
     public class ActionEduCollege_Metadata
     {
+        [Required]
+        public int Id { get; set; }
+
+        [Required]
+        public int ActionEduId { get; set; }
+
+        [Required]
+        public int CollegeId { get; set; }
+
+        [Display(Name = "Nombre d'élèves")]
+        public int NbEleves { get; set; }
+
+        [Display(Name = "Montant")]
+        public int Montant { get; set; }
+
+        [Display(Name = "Commentaire (interne)")]
+        public int CommentaireInterne { get; set; }
+
+        [Display(Name = "Commentaire (public)")]
+        public int CommentairePublic { get; set; }
 
     }
 }

+ 5 - 0
CD67.FicheCollege.MVC/CD67.FicheCollege.MVC.csproj

@@ -415,6 +415,11 @@
     <Content Include="Views\ActionsEdu\Delete.cshtml" />
     <Content Include="Views\ActionsEdu\Edit.cshtml" />
     <Content Include="Views\ActionsEdu\Index.cshtml" />
+    <Content Include="Views\ActionsEdu\Details.cshtml" />
+    <Content Include="Views\ActionsEduCollege\Details.cshtml" />
+    <Content Include="Views\ActionsEduCollege\Create.cshtml" />
+    <Content Include="Views\ActionsEduCollege\Delete.cshtml" />
+    <Content Include="Views\ActionsEduCollege\Edit.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />

+ 117 - 2
CD67.FicheCollege.MVC/Controllers/ActionsEduCollegeController.cs

@@ -13,7 +13,7 @@ namespace CD67.FicheCollege.MVC.Controllers
     {
         private Entities db = new Entities();
 
-        // GET: Actions
+        // GET: ActionsEdu
         public ActionResult Index(int? annee_id)
         {
             if (annee_id == null)
@@ -23,8 +23,123 @@ namespace CD67.FicheCollege.MVC.Controllers
 
             AnneeFactory fact = new AnneeFactory(db);
             Annee annee = fact.getById(annee_id);
-            AnneeViewModel model = new AnneeViewModel(annee, ModeAcces.Lecture);
+            AnneeViewModel model = new AnneeViewModel(annee);
             return View(model);
         }
+
+        // GET: ActionsEdu/Details/5
+        public ActionResult Details(int? id)
+        {
+            if (id == null)
+            {
+                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
+            }
+            ActionEduCollegeFactory fact = new ActionEduCollegeFactory(db);
+            Entity.ActionEduCollege actionEduCollege = fact.getById(id);
+            if (actionEduCollege == null)
+            {
+                return HttpNotFound();
+            }
+            ActionEduCollegeViewModel model = new ActionEduCollegeViewModel(actionEduCollege, db);
+
+            return View(model);
+        }
+
+        // GET: ActionEduCollege/Create
+        public ActionResult Create(int? actionEdu_id)
+        {
+            if (actionEdu_id == null)
+            {
+                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
+            }
+            ActionEduCollege actionEduCollege = new ActionEduCollege();
+            actionEduCollege.ActionEduId = actionEdu_id.Value;
+            ActionEduFactory fact = new ActionEduFactory(db);
+            actionEduCollege.ActionEdu = fact.getById(actionEdu_id);
+
+            ActionEduCollegeViewModel model = new ActionEduCollegeViewModel(actionEduCollege, db, ModeAcces.Creation);
+            return View(model);
+        }
+
+        // POST: ActionEduAxe/Create
+        // Afin de déjouer les attaques par sur-validation, activez les propriétés spécifiques que vous voulez lier. Pour 
+        // plus de détails, voir  http://go.microsoft.com/fwlink/?LinkId=317598.
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public ActionResult Create(ActionEduCollege actionEduCollege)
+        {
+            if (ModelState.IsValid)
+            {
+                ActionEduCollegeFactory fact = new ActionEduCollegeFactory(db);
+                fact.add(ref actionEduCollege);
+                return RedirectToAction("Details", "ActionsEdu", new { Id = actionEduCollege.ActionEduId });
+            }
+
+            ActionEduCollegeViewModel model = new ActionEduCollegeViewModel(actionEduCollege, db, ModeAcces.Creation);
+            return View(model);
+        }
+
+        // GET: ActionEduAxe/Edit/5
+        public ActionResult Edit(int? id)
+        {
+            if (id == null)
+            {
+                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
+            }
+            ActionEduCollegeFactory fact = new ActionEduCollegeFactory(db);
+            ActionEduCollege actionEduCollege = fact.getById(id.Value);
+            if (actionEduCollege == null)
+            {
+                return HttpNotFound();
+            }
+            ActionEduCollegeViewModel model = new ActionEduCollegeViewModel(actionEduCollege, db, ModeAcces.Modification);
+            return View(model);
+        }
+
+        // POST: ActionEduAxe/Edit/5
+        // Afin de déjouer les attaques par sur-validation, activez les propriétés spécifiques que vous voulez lier. Pour 
+        // plus de détails, voir  http://go.microsoft.com/fwlink/?LinkId=317598.
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public ActionResult Edit(ActionEduCollege actionEduCollege)
+        {
+            if (ModelState.IsValid)
+            {
+                ActionEduCollegeFactory fact = new ActionEduCollegeFactory(db);
+                fact.update(ref actionEduCollege);
+                return RedirectToAction("Details", new { id = actionEduCollege.Id });
+            }
+            ActionEduCollegeViewModel model = new ActionEduCollegeViewModel(actionEduCollege, db, ModeAcces.Modification);
+            return View(model);
+        }
+
+        // GET: ActionEduAxe/Delete/5
+        public ActionResult Delete(int? id)
+        {
+            if (id == null)
+            {
+                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
+            }
+            ActionEduCollegeFactory fact = new ActionEduCollegeFactory(db);
+            ActionEduCollege actionEduCollege = fact.getById(id.Value);
+            if (actionEduCollege == null)
+            {
+                return HttpNotFound();
+            }
+            ActionEduCollegeViewModel model = new ActionEduCollegeViewModel(actionEduCollege, db);
+            return View(model);
+        }
+
+        // POST: ActionEduAxe/Delete/5
+        [HttpPost, ActionName("Delete")]
+        [ValidateAntiForgeryToken]
+        public ActionResult DeleteConfirmed(int id)
+        {
+            ActionEduCollegeFactory fact = new ActionEduCollegeFactory(db);
+            ActionEduCollege actionEduCollege = fact.getById(id);
+            fact.delete(ref actionEduCollege);
+            return RedirectToAction("Details", "ActionsEdu", new { id = actionEduCollege.ActionEduId });
+        }
+
     }
 }

+ 19 - 0
CD67.FicheCollege.MVC/Controllers/ActionsEduController.cs

@@ -26,6 +26,25 @@ namespace CD67.FicheCollege.MVC.Controllers
             return View(model);
         }
 
+        // GET: ActionsEdu/Details/5
+        public ActionResult Details(int? id)
+        {
+            if (id == null)
+            {
+                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
+            }
+            ActionEduFactory fact = new ActionEduFactory(db);
+            Entity.ActionEdu actionEdu = fact.getById(id);
+            if (actionEdu == null)
+            {
+                return HttpNotFound();
+            }
+            ActionEduViewModel model = new ActionEduViewModel(actionEdu, db);
+
+            return View(model);
+        }
+
+
         // GET: ActionEduAxe/Create
         public ActionResult Create(int? annee_id)
         {

+ 5 - 1
CD67.FicheCollege.MVC/Models/ActionEduCollegeViewModel.cs

@@ -8,8 +8,12 @@ namespace CD67.FicheCollege.MVC.Models
 {
     public class ActionEduCollegeViewModel : BaseViewModel<ActionEduCollege>
     {
-        public ActionEduCollegeViewModel(ActionEduCollege model, ModeAcces acces = ModeAcces.Lecture, Dictionary<string, object> bag = null) : base(model, acces, bag)
+        public SelectList Sel_College;
+
+        public ActionEduCollegeViewModel(ActionEduCollege model, Entities dbContext, ModeAcces acces = ModeAcces.Lecture, Dictionary<string, object> bag = null) : base(model, acces, bag)
         {
+            CollegeFactory fact = new CollegeFactory(dbContext);
+            Sel_College = new SelectList(fact.getAll(), "Id", "Libelle", Obj.CollegeId);
         }
 
         public override string Annee_Lib { get { return Obj.ActionEdu.Annee.Libelle; } }

+ 0 - 9
CD67.FicheCollege.MVC/Models/ActionEduViewModel.cs

@@ -23,13 +23,4 @@ namespace CD67.FicheCollege.MVC.Models
 
     }
 
-    public class ActionEduIndexViewModel : BaseViewModel<IEnumerable<ActionEdu>>
-    {
-        public ActionEduIndexViewModel(IEnumerable<ActionEdu> model, ModeAcces acces = ModeAcces.Lecture, Dictionary<string, object> bag = null) : base(model, acces, bag)
-        {
-        }
-
-        public override string Annee_Lib { get { return ""; } }
-
-    }
 }

+ 69 - 0
CD67.FicheCollege.MVC/Views/ActionsEdu/Details.cshtml

@@ -0,0 +1,69 @@
+@using CD67.FicheCollege.MVC.Models
+@model ActionEduViewModel
+
+@{
+    ViewBag.Title = "Details";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+    ActionEdu actionEdu = Model.Obj;
+}
+
+<h1>Les Actions</h1>
+
+<div>
+    @Html.ActionLink("Retour à la liste", "Index")
+</div>
+
+<h2>@actionEdu.Nom</h2>
+
+<fieldset>
+    <legend>
+        Données de base
+        @if (Model.Acces == ModeAcces.Lecture)
+        {
+            <span class="pull-right">
+                @Html.ActionLink("Supprimer", "Delete", "ActionsEdu", new { Id = actionEdu.Id }, new { @class = "btn btn-danger" })
+                @Html.ActionLink("Modifier", "Edit", "ActionsEdu", new { Id = actionEdu.Id }, new { @class = "btn btn-default" })
+            </span>
+        }
+    </legend>
+    <dl class="dl-horizontal">
+        <dt>@Html.DisplayNameFor(model => actionEdu.ActionEduThematique.ActionEduAxe.Nom)</dt>
+        <dd>@Html.DisplayFor(model => actionEdu.ActionEduThematique.ActionEduAxe.Nom)</dd>
+
+        <dt>@Html.DisplayNameFor(model => actionEdu.ActionEduThematique.Nom)</dt>
+        <dd>@Html.DisplayFor(model => actionEdu.ActionEduThematique.Nom)</dd>
+
+        <dt>@Html.DisplayNameFor(model => actionEdu.Numero)</dt>
+        <dd>@Html.DisplayFor(model => actionEdu.Numero)</dd>
+
+        <dt>@Html.DisplayNameFor(model => actionEdu.Nom)</dt>
+        <dd>@Html.DisplayFor(model => actionEdu.Nom)</dd>
+
+        <dt>@Html.DisplayNameFor(model => actionEdu.Description)</dt>
+        <dd>@Html.DisplayFor(model => actionEdu.Description)</dd>
+
+        <dt>@Html.DisplayNameFor(model => actionEdu.Neutralise)</dt>
+        <dd>@Html.DisplayFor(model => actionEdu.Neutralise)</dd>
+    </dl>
+</fieldset>
+
+@if (Model.Acces == ModeAcces.Lecture)
+{
+    <legend>
+        Collège(s) concerné(s)
+        <span class="pull-right">
+            @Html.ActionLink("Ajouter", "Create", "ActionsEduCollege", new { actionEdu_id = actionEdu.Id }, new { @class = "btn btn-default" })
+        </span>
+    </legend>
+
+
+    foreach (ActionEduCollege item in Model.Obj.ActionsEduColleges)
+    {
+        <div>
+            <span>@item.College.Libelle</span> <span> @Html.ActionLink("Voir", "Details", "ActionsEduCollege", new { Id = item.Id }, new { @class = "btn btn-default" })</span>
+        </div>
+    }
+
+}
+
+

+ 30 - 85
CD67.FicheCollege.MVC/Views/ActionsEdu/Index.cshtml

@@ -1,97 +1,42 @@
 @using CD67.FicheCollege.MVC.Models
 @model AnneeViewModel
 
+<title>Actions @Model.Annee_Lib</title>
+
 @{
-    ViewBag.Title = "Liste";
+    ViewBag.Title = "Actions " + @Model.Annee_Lib;
     Layout = "~/Views/Shared/_Layout.cshtml";
     ActionEdu action_model = new ActionEdu();
-    int maxOrdre = Model.Obj.ActionsEdu.Count() == 0 ? 0 : Model.Obj.ActionsEdu.Max(i => i.Ordre);
-    int row = 1;
+    int cur_axe_id = -1;
+    int cur_th_id = -1;
 }
 
-<h2>Liste</h2>
-
-<p>
-    <a href="@Url.Action("Create", new { annee_id = Model.Obj.Id })">
-        <span class="glyphicon glyphicon-plus-sign fa-2x color1" style="vertical-align: middle" aria-hidden="true"></span>
-        Créer un nouvel élément
-    </a>
-</p>
+<h2>Les Actions</h2>
 
-<table class="table">
-    <tr>
-        <th>
-            @Html.DisplayNameFor(model => action_model.Numero)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => action_model.Nom)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => action_model.Description)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => action_model.Neutralise)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => action_model.ActionEduThematique.ActionEduAxeId)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => action_model.ActionEduThematiqueId)
-        </th>
-        <th></th>
-    </tr>
-
-    @foreach (ActionEdu item in Model.Obj.ActionsEdu.OrderBy(i=>i.Ordre))
+@foreach (ActionEdu item in Model.Obj.ActionsEdu.OrderBy(a => a.ActionEduThematique.ActionEduAxe.Ordre).ThenBy(a => a.ActionEduThematique.Ordre).ThenBy(a => a.Ordre))
+{
+    if (item.ActionEduThematique.ActionEduAxe.Id != cur_axe_id){
+        cur_axe_id = item.ActionEduThematique.ActionEduAxe.Id;
+        <h3>@item.ActionEduThematique.ActionEduAxe.Nom</h3>
+    }
+    if (item.ActionEduThematique.Id != cur_th_id)
     {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.Numero)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Nom)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Description)
-            </td>        
-            <td>
-                @Html.DisplayFor(modelItem => item.Neutralise)
-            </td>
-            <th>
-                @Html.DisplayFor(model => item.ActionEduThematique.ActionEduAxeId)
-            </th>
-            <th>
-                @Html.DisplayFor(model => item.ActionEduThematiqueId)
-            </th>
-            <td>
-                @if (row != 1)
-                    {
-                    <a href="@Url.Action("Up", new { id = item.Id })">
-                        <span class="glyphicon glyphicon-circle-arrow-up fa-2x color1" title="Remonter" style="vertical-align: middle" aria-hidden="true"></span>
-                    </a>
-                }
-                else
-                {
-                    <span class="glyphicon glyphicon-circle-arrow-up fa-2x color2" title="Remonter" style="vertical-align: middle" aria-hidden="true"></span>
-                }
-                @if (item.Ordre != maxOrdre)
-                    {
-                    <a href="@Url.Action("Down", new { id = item.Id })">
-                        <span class="glyphicon glyphicon-circle-arrow-down fa-2x color1" title="Descendre" style="vertical-align: middle" aria-hidden="true"></span>
-                    </a>
-                }
-                else
-                {
-                    <span class="glyphicon glyphicon-circle-arrow-down fa-2x color2" title="Descendre" style="vertical-align: middle" aria-hidden="true"></span>
-                }
-                <a href="@Url.Action("Edit", new { id = item.Id })">
-                    <span class="glyphicon glyphicon-edit fa-2x color1" title="Modifier" style="vertical-align: middle" aria-hidden="true"></span>
-                </a>
-                <a href="@Url.Action("Delete", new { id = item.Id })">
-                    <span class="glyphicon glyphicon-remove-sign fa-2x color1" title="Supprimer" style="vertical-align: middle" aria-hidden="true"></span>
-                </a>
-            </td>
-        </tr>
-        row += 1;
+        cur_th_id = item.ActionEduThematique.Id;
+        <h4>@item.ActionEduThematique.Nom</h4>
     }
 
-</table>
+    <div>
+        <span>
+            <a href="@Url.Action("Details", new { id = item.Id })">@Html.DisplayFor(modelItem => item.Numero) - @Html.DisplayFor(modelItem => item.Nom)</a>
+        </span>
+        <i>Collèges concernés: @item.ActionsEduColleges.Count()</i>
+    </div>
+}
+
+
+<h3>Administration</h3>
+
+<ul>
+    <li>@Html.ActionLink("Les axes", "Index", "ActionEduAxes")</li>
+    <li>@Html.ActionLink("Les thématiques", "Index", "ActionEduThematiques")</li>
+</ul>

+ 68 - 0
CD67.FicheCollege.MVC/Views/ActionsEduCollege/Create.cshtml

@@ -0,0 +1,68 @@
+@using CD67.FicheCollege.MVC.Models
+@model ActionEduCollegeViewModel
+
+@{
+    ViewBag.Title = "Création";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+    ActionEduCollege actionEduCollege = Model.Obj;
+}
+
+@using (Html.BeginForm()) 
+{
+    @Html.AntiForgeryToken()
+    
+    <div class="form-horizontal">
+        <h4>Actions</h4>
+        <hr />
+        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
+        @Html.HiddenFor(model => actionEduCollege.Id)
+        @Html.HiddenFor(model => actionEduCollege.ActionEduId)
+        
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.CollegeId, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.DropDownListFor(model => actionEduCollege.CollegeId, Model.Sel_College, htmlAttributes: new { @class = "form-control" })
+                @Html.ValidationMessageFor(model => actionEduCollege.CollegeId, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.NbEleves, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEduCollege.NbEleves, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEduCollege.NbEleves, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.Montant, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEduCollege.Montant, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEduCollege.Montant, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.CommentaireInterne, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEduCollege.CommentaireInterne, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEduCollege.CommentaireInterne, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.CommentairePublic, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEduCollege.CommentairePublic, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEduCollege.CommentairePublic, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" value="Créer" class="btn btn-default" />
+            </div>
+        </div>
+    </div>
+}

+ 39 - 0
CD67.FicheCollege.MVC/Views/ActionsEduCollege/Delete.cshtml

@@ -0,0 +1,39 @@
+@using CD67.FicheCollege.MVC.Models
+@model ActionEduCollegeViewModel
+
+@{
+    ViewBag.Title = "Suppression";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+    ActionEduCollege actionEduCollege = Model.Obj;
+}
+
+<h2>Suppression</h2>
+
+<h3>Voulez-vous vraiment supprimer cet élément?</h3>
+<div>
+    <h4>Action</h4>
+    <hr />
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => actionEduCollege.College.Libelle)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => actionEduCollege.College.Libelle)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => actionEduCollege.ActionEdu.Nom)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => actionEduCollege.ActionEdu.Nom)
+        </dd>
+    </dl>
+
+    @using (Html.BeginForm()) {
+        @Html.AntiForgeryToken()
+
+        <div class="form-actions no-color">
+            <input type="submit" value="Supprimer" class="btn btn-default" /> |
+            @Html.ActionLink("Retour à la liste", "Index")
+        </div>
+    }
+</div>

+ 42 - 0
CD67.FicheCollege.MVC/Views/ActionsEduCollege/Details.cshtml

@@ -0,0 +1,42 @@
+@using CD67.FicheCollege.MVC.Models
+@model ActionEduCollegeViewModel
+
+@{
+    ViewBag.Title = "Details";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+    ActionEduCollege actionEduCollege = Model.Obj;
+}
+
+<h1>Les Actions</h1>
+
+<div>
+    @Html.ActionLink("Retour", "Details", "ActionsEdu", new { id = actionEduCollege.ActionEdu.Id }, new { @class = "btn btn-default" })
+</div>
+
+<h2>@actionEduCollege.ActionEdu.Nom,  collège @actionEduCollege.College.Libelle</h2>
+
+<fieldset>
+    <legend>
+        Informations
+        @if (Model.Acces == ModeAcces.Lecture)
+        {
+            <span class="pull-right">
+                @Html.ActionLink("Supprimer", "Delete", "ActionsEduCollege", new { Id = actionEduCollege.Id }, new { @class = "btn btn-danger" })
+                @Html.ActionLink("Modifier", "Edit", "ActionsEduCollege", new { Id = actionEduCollege.Id }, new { @class = "btn btn-default" })
+            </span>
+        }
+    </legend>
+    <dl class="dl-horizontal">
+        <dt>@Html.DisplayNameFor(model => actionEduCollege.NbEleves)</dt>
+        <dd>@Html.DisplayFor(model => actionEduCollege.NbEleves)</dd>
+
+        <dt>@Html.DisplayNameFor(model => actionEduCollege.Montant)</dt>
+        <dd>@Html.DisplayFor(model => actionEduCollege.Montant)</dd>
+
+        <dt>@Html.DisplayNameFor(model => actionEduCollege.CommentaireInterne)</dt>
+        <dd>@Html.DisplayFor(model => actionEduCollege.CommentaireInterne)</dd>
+
+        <dt>@Html.DisplayNameFor(model => actionEduCollege.CommentairePublic)</dt>
+        <dd>@Html.DisplayFor(model => actionEduCollege.CommentairePublic)</dd>
+    </dl>
+</fieldset>

+ 68 - 0
CD67.FicheCollege.MVC/Views/ActionsEduCollege/Edit.cshtml

@@ -0,0 +1,68 @@
+@using CD67.FicheCollege.MVC.Models
+@model ActionEduCollegeViewModel
+
+@{
+    ViewBag.Title = "Modification";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+    ActionEduCollege actionEduCollege = Model.Obj;
+}
+
+@using (Html.BeginForm()) 
+{
+    @Html.AntiForgeryToken()
+    
+    <div class="form-horizontal">
+        <h4>Actions</h4>
+        <hr />
+        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
+        @Html.HiddenFor(model => actionEduCollege.Id)
+        @Html.HiddenFor(model => actionEduCollege.ActionEduId)
+        
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.CollegeId, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.DropDownListFor(model => actionEduCollege.CollegeId, Model.Sel_College, htmlAttributes: new { @class = "form-control" })
+                @Html.ValidationMessageFor(model => actionEduCollege.CollegeId, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.NbEleves, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEduCollege.NbEleves, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEduCollege.NbEleves, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.Montant, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEduCollege.Montant, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEduCollege.Montant, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.CommentaireInterne, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEduCollege.CommentaireInterne, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEduCollege.CommentaireInterne, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => actionEduCollege.CommentairePublic, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEduCollege.CommentairePublic, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEduCollege.CommentairePublic, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" value="Enregistrer" class="btn btn-default" />
+            </div>
+        </div>
+    </div>
+}

+ 13 - 25
CD67.FicheCollege.MVC/Views/ActionsEduCollege/Index.cshtml

@@ -13,30 +13,19 @@
 
 <h3>Affectation</h3>
 
-<table class="table">
-    <tr>
-        <th>
-            @Html.DisplayNameFor(model => action_model.Nom)
-        </th>
-        <th></th>
-    </tr>
-
-    @foreach (ActionEdu item in Model.Obj.ActionsEdu.OrderBy(a => a.Ordre))
-    {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.Nom)
-            </td>
-            <td>
-                Collèges concernés: @item.ActionsEduColleges.Count()
-                <a href="@Url.Action("Voir", new { id = item.Id })">
-                    <span class="glyphicon glyphicon-plus-sign fa-2x color1" title="Voir" style="vertical-align: middle" aria-hidden="true"></span>
-                </a>
-            </td>
-        </tr>
-    }
-
-</table>
+@foreach (ActionEdu item in Model.Obj.ActionsEdu.OrderBy(a => a.Ordre))
+{
+    <div>
+        @Html.DisplayFor(modelItem => item.ActionEduThematique.ActionEduAxe.Nom)
+        @Html.DisplayFor(modelItem => item.ActionEduThematique.Nom)
+        @Html.DisplayFor(modelItem => item.Nom)
+
+        <i>Collèges concernés: @item.ActionsEduColleges.Count()</i>
+        <a href="@Url.Action("Details", new { id = item.Id })">
+            <span class="glyphicon glyphicon-plus-sign fa-2x color1" title="Voir" style="vertical-align: middle" aria-hidden="true"></span>
+        </a>
+    </div>
+}
 
 
 <h3>Administration</h3>
@@ -44,5 +33,4 @@
 <ul>
     <li>@Html.ActionLink("Les axes", "Index", "ActionEduAxes")</li>
     <li>@Html.ActionLink("Les thématiques", "Index", "ActionEduThematiques")</li>
-    <li>@Html.ActionLink("Les actions " + @Model.Annee_Lib, "Index", "ActionsEdu", new { annee_id = Model.Obj.Id }, null)</li>
 </ul>

+ 1 - 1
CD67.FicheCollege.MVC/Views/Annees/Details.cshtml

@@ -12,5 +12,5 @@
 
 <ul>
     <li>@Html.ActionLink("Les collèges", "Index", "Colleges", new { annee_id = Model.Obj.Id }, null)</li>
-    <li>@Html.ActionLink("Les actions", "Index", "ActionsEduCollege", new { annee_id = Model.Obj.Id }, null)</li>
+    <li>@Html.ActionLink("Les actions", "Index", "ActionsEdu", new { annee_id = Model.Obj.Id }, null)</li>
 </ul>