CHG Ajout du champ ActionEdu.Numero

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

@@ -1,5 +1,6 @@
 CREATE TABLE [dbo].[ActionsEdu] (
     [Id]                    INT            IDENTITY (1, 1) NOT NULL,
+    [Numero] INT NOT NULL, 
     [Nom]                   NVARCHAR (MAX) NOT NULL,
     [Description]           NVARCHAR (MAX) NOT NULL,
     [Neutralise]            BIT            NOT NULL,

CD67.FicheCollege.Entity/ActionEdu.cs

@@ -14,7 +14,14 @@ namespace CD67.FicheCollege.Entity
     
     public partial class ActionEdu
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public ActionEdu()
+        {
+            this.Numero = "0";
+        }
+    
         public int Id { get; set; }
+        public string Numero { get; set; }
         public string Nom { get; set; }
         public string Description { get; set; }
         public bool Neutralise { get; set; }

CD67.FicheCollege.Entity/EntityModel.edmx

@@ -151,6 +151,7 @@
       <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" />
@@ -452,6 +453,7 @@
             <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="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="Neutralise" Type="Boolean" Nullable="false" />
@@ -617,6 +619,7 @@
       <EntityTypeMapping TypeName="IsTypeOf(CD67.FicheCollege.ActionEdu)">
         <MappingFragment StoreEntitySet="ActionsEdu">
           <ScalarProperty Name="Id" ColumnName="Id" />
+          <ScalarProperty Name="Numero" ColumnName="Numero" />
           <ScalarProperty Name="Nom" ColumnName="Nom" />
           <ScalarProperty Name="Description" ColumnName="Description" />
           <ScalarProperty Name="Neutralise" ColumnName="Neutralise" />

CD67.FicheCollege.Entity/EntityModel.edmx.diagram

@@ -16,7 +16,7 @@
         <AssociationConnector Association="CD67.FicheCollege.AnneeCollege" />
         <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduAxe" Width="1.5" PointX="11.125" PointY="3.125" />
         <EntityTypeShape EntityType="CD67.FicheCollege.ActionEduThematique" Width="1.875" PointX="8.875" PointY="3.25" />
-        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEdu" Width="1.5" PointX="6.75" PointY="3.25" />
+        <EntityTypeShape EntityType="CD67.FicheCollege.ActionEdu" Width="1.5" PointX="6.875" PointY="3.25" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduAxeActionEduThematique" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduThematiqueActionEdu" />
         <AssociationConnector Association="CD67.FicheCollege.ActionEduAnnee" />

CD67.FicheCollege.Entity/EntityModel.edmx.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------
 -- Entity Designer DDL Script for SQL Server 2005, 2008, 2012 and Azure
 -- --------------------------------------------------
--- Date Created: 03/01/2018 11:40:44
+-- Date Created: 03/01/2018 14:38:50
 -- Generated from EDMX file: C:\dev\dotnet\FicheCollege\CD67.FicheCollege.Entity\EntityModel.edmx
 -- --------------------------------------------------
 
@@ -17,18 +17,6 @@ GO
 -- Dropping existing FOREIGN KEY constraints
 -- --------------------------------------------------
 
-IF OBJECT_ID(N'[dbo].[FK_ActionEduAnnee]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[ActionsEdu] DROP CONSTRAINT [FK_ActionEduAnnee];
-GO
-IF OBJECT_ID(N'[dbo].[FK_ActionEduAxeActionEduThematique]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[ActionEduThematiques] DROP CONSTRAINT [FK_ActionEduAxeActionEduThematique];
-GO
-IF OBJECT_ID(N'[dbo].[FK_ActionEduThematiqueActionEdu]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[ActionsEdu] DROP CONSTRAINT [FK_ActionEduThematiqueActionEdu];
-GO
-IF OBJECT_ID(N'[dbo].[FK_AnneeCollege]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[Colleges] DROP CONSTRAINT [FK_AnneeCollege];
-GO
 IF OBJECT_ID(N'[dbo].[FK_Colleges_Territoires]', 'F') IS NOT NULL
     ALTER TABLE [dbo].[Colleges] DROP CONSTRAINT [FK_Colleges_Territoires];
 GO
@@ -38,22 +26,28 @@ GO
 IF OBJECT_ID(N'[dbo].[FK_FicheIdentite_College]', 'F') IS NOT NULL
     ALTER TABLE [dbo].[Identites] DROP CONSTRAINT [FK_FicheIdentite_College];
 GO
+IF OBJECT_ID(N'[dbo].[FK_AnneeCollege]', 'F') IS NOT NULL
+    ALTER TABLE [dbo].[Colleges] DROP CONSTRAINT [FK_AnneeCollege];
+GO
+IF OBJECT_ID(N'[dbo].[FK_ActionEduAxeActionEduThematique]', 'F') IS NOT NULL
+    ALTER TABLE [dbo].[ActionEduThematiques] DROP CONSTRAINT [FK_ActionEduAxeActionEduThematique];
+GO
+IF OBJECT_ID(N'[dbo].[FK_ActionEduThematiqueActionEdu]', 'F') IS NOT NULL
+    ALTER TABLE [dbo].[ActionsEdu] DROP CONSTRAINT [FK_ActionEduThematiqueActionEdu];
+GO
+IF OBJECT_ID(N'[dbo].[FK_ActionEduAnnee]', 'F') IS NOT NULL
+    ALTER TABLE [dbo].[ActionsEdu] DROP CONSTRAINT [FK_ActionEduAnnee];
+GO
 
 -- --------------------------------------------------
 -- Dropping existing tables
 -- --------------------------------------------------
 
-IF OBJECT_ID(N'[dbo].[ActionEduAxes]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[ActionEduAxes];
-GO
-IF OBJECT_ID(N'[dbo].[ActionEduThematiques]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[ActionEduThematiques];
-GO
-IF OBJECT_ID(N'[dbo].[ActionsEdu]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[ActionsEdu];
+IF OBJECT_ID(N'[dbo].[TypesCollege]', 'U') IS NOT NULL
+    DROP TABLE [dbo].[TypesCollege];
 GO
-IF OBJECT_ID(N'[dbo].[Annees]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[Annees];
+IF OBJECT_ID(N'[dbo].[Territoires]', 'U') IS NOT NULL
+    DROP TABLE [dbo].[Territoires];
 GO
 IF OBJECT_ID(N'[dbo].[Colleges]', 'U') IS NOT NULL
     DROP TABLE [dbo].[Colleges];
@@ -61,11 +55,17 @@ GO
 IF OBJECT_ID(N'[dbo].[Identites]', 'U') IS NOT NULL
     DROP TABLE [dbo].[Identites];
 GO
-IF OBJECT_ID(N'[dbo].[Territoires]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[Territoires];
+IF OBJECT_ID(N'[dbo].[Annees]', 'U') IS NOT NULL
+    DROP TABLE [dbo].[Annees];
 GO
-IF OBJECT_ID(N'[dbo].[TypesCollege]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[TypesCollege];
+IF OBJECT_ID(N'[dbo].[ActionEduAxes]', 'U') IS NOT NULL
+    DROP TABLE [dbo].[ActionEduAxes];
+GO
+IF OBJECT_ID(N'[dbo].[ActionEduThematiques]', 'U') IS NOT NULL
+    DROP TABLE [dbo].[ActionEduThematiques];
+GO
+IF OBJECT_ID(N'[dbo].[ActionsEdu]', 'U') IS NOT NULL
+    DROP TABLE [dbo].[ActionsEdu];
 GO
 
 -- --------------------------------------------------
@@ -178,6 +178,7 @@ GO
 -- Creating table 'ActionsEdu'
 CREATE TABLE [dbo].[ActionsEdu] (
     [Id] int IDENTITY(1,1) NOT NULL,
+    [Numero] nvarchar(max)  NOT NULL,
     [Nom] nvarchar(max)  NOT NULL,
     [Description] nvarchar(max)  NOT NULL,
     [Neutralise] bit  NOT NULL,

CD67.FicheCollege.Entity/Extend/ActionEdu.cs

@@ -27,6 +27,10 @@ namespace CD67.FicheCollege.Entity
         [Display(Name = "Année")]
         public int AnneeId { get; set; }
 
+        [Required]
+        [Display(Name = "Numéro")]
+        public int Numero { get; set; }
+
         [Required]
         [Display(Name = "Thématique")]
         public int ActionEduThematiqueId { get; set; }

CD67.FicheCollege.MVC/Views/ActionsEdu/Create.cshtml

@@ -19,6 +19,14 @@
         @Html.HiddenFor(model => actionEdu.Ordre)
         @Html.HiddenFor(model => actionEdu.AnneeId)
 
+        <div class="form-group">
+            @Html.LabelFor(model => actionEdu.Numero, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEdu.Numero, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEdu.Numero, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
         <div class="form-group">
             @Html.LabelFor(model => actionEdu.Nom, htmlAttributes: new { @class = "control-label col-md-2" })
             <div class="col-md-10">

CD67.FicheCollege.MVC/Views/ActionsEdu/Edit.cshtml

@@ -22,6 +22,14 @@
         @Html.HiddenFor(model => actionEdu.Ordre)
         @Html.HiddenFor(model => actionEdu.AnneeId)
 
+        <div class="form-group">
+            @Html.LabelFor(model => actionEdu.Numero, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => actionEdu.Numero, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => actionEdu.Numero, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
         <div class="form-group">
             @Html.LabelFor(model => actionEdu.Nom, htmlAttributes: new { @class = "control-label col-md-2" })
             <div class="col-md-10">

CD67.FicheCollege.MVC/Views/ActionsEdu/Index.cshtml

@@ -20,6 +20,9 @@
 
 <table class="table">
     <tr>
+        <th>
+            @Html.DisplayNameFor(model => action_model.Numero)
+        </th>
         <th>
             @Html.DisplayNameFor(model => action_model.Nom)
         </th>
@@ -41,6 +44,9 @@
     @foreach (ActionEdu item in Model.Obj.ActionsEdu.OrderBy(i=>i.Ordre))
     {
         <tr>
+            <td>
+                @Html.DisplayFor(modelItem => item.Numero)
+            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Nom)
             </td>