Corrections diverses

CD67.FicheCollege.Entity/Extend/College.cs

@@ -18,21 +18,54 @@ namespace CD67.FicheCollege.Entity
     {
         [Required]
         public string Id { get; set; }
+
         [Required]
         [Display(Name = "Code RNE du collège")]
         public string CodeRne { get; set; }
+
+        [Required]
         [Display(Name = "Année scolaire")]
         public string Annee_Id { get; set; }
+
         [Required]
-        [Display(Name = "Collège")]
+        [Display(Name = "Nom")]
         public string Libelle { get; set; }
+
+        [Display(Name = "Adresse")]
+        public string Adresse { get; set; }
+
         [Display(Name = "Code postal")]
         public string Code_Postal { get; set; }
+
         [Display(Name = "Type d'établissement")]
         public int TypeCollege_Id { get; set; }
-        [Display(Name = "Territoire de rattachement")]
-        public string Territoire_Id { get; set; }
+
+        [Display(Name = "Code INSEE")]
+        public string Commune_Insee { get; set; }
+
+        [Required]
+        [Display(Name = "Commune")]
+        public string Commune { get; set; }
+
         [Display(Name = "Canton de rattachement")]
         public string Canton { get; set; }
+
+        [Display(Name = "Territoire de rattachement")]
+        public string Territoire_Id { get; set; }
+
+        [Display(Name = "TAD")]
+        public string TAD { get; set; }
+
+        [Display(Name = "CDC")]
+        public string CDC { get; set; }
+
+        [Display(Name = "Téléphone")]
+        public string Tel { get; set; }
+
+        [Display(Name = "Fax")]
+        public string Fax { get; set; }
+
+        [Display(Name = "EMail")]
+        public string Email { get; set; }
     }
 }

CD67.FicheCollege.MVC/CD67.FicheCollege.MVC.csproj

@@ -412,7 +412,6 @@
     <Content Include="Views\Annees\Details.cshtml" />
     <Content Include="Views\Annees\Index.cshtml" />
     <Content Include="Views\Colleges\Index.cshtml" />
-    <Content Include="Views\ActionsEduCollege\Index.cshtml" />
     <Content Include="Views\ActionEduAxes\Create.cshtml" />
     <Content Include="Views\ActionEduAxes\Delete.cshtml" />
     <Content Include="Views\ActionEduAxes\Edit.cshtml" />

CD67.FicheCollege.MVC/Content/cd67-custom.less

@@ -91,6 +91,7 @@ label[for="recherche"]{
     width: 210px;
 }
 
+
 header .search{
     cursor: pointer;
 }
@@ -102,10 +103,11 @@ h1 .sup{
 
 header nav{
     padding: 0 1em 0 1em;
+    border-bottom: 1px solid;
 }
 
 #content {
-    margin: 4em auto;
+    margin: 3em auto;
     width: 80%;
 }
 

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

@@ -153,14 +153,18 @@
             <div class="form-group">
                 <div class="col-md-offset-2 col-md-10">
                     <input type="submit" value="@Model.Acces.EnumDisplayNameFor(MvcHtmlHelpers.DisplayValue.Prompt)" class="btn btn-default" />
-                    @if (Model.Acces == ModeAcces.Creation)
-                    { @Html.ActionLink("Annuler", "Index") }
-                    else
-                    { @Html.ActionLink("Annuler", "Details", new { Id = college.Id }) }
                 </div>
             </div>
         </div>
     </fieldset>
+
+    <br/>
+
+    if (Model.Acces == ModeAcces.Creation)
+    { @Html.ActionLink("Annuler", "Index", new { annee_id = college.Annee_Id }) }
+    else
+    { @Html.ActionLink("Annuler", "Details", new { Id = college.Id }) }
+
 }
 
 @section Scripts {

CD67.FicheCollege.MVC/Views/Shared/_Layout.cshtml

@@ -51,11 +51,9 @@
                 <div id="open-button" class="menu-button"><span>Menu</span></div>
 
                 @* Titre et année en cours *@
-                <ul id="titre" class="nav navbar ">
-                    <li>
-                        <h1 id="app-title">Fiches collège <a href="/Annees">@Model.Annee_Lib <sup class="fa fa-edit sup"></sup></a></h1>
-                    </li>
-                </ul>
+                <span id="titre" class="nav navbar">
+                    <h1 id="app-title">Fiches collège <a href="/Annees">@Model.Annee_Lib <sup class="fa fa-edit sup"></sup></a></h1>
+                </span>
                 
                 <ul class="nav navbar-nav navbar-right">
 
@@ -133,14 +131,14 @@
     <div id="wrapper">
 
         @* Breadcrumb *@
-        <div class="no-print" >
+        @*<div class="no-print" >
             <ul class="background-color1" id="breadcrumbs-one">
                 <li><a href="/">Accueil</a><span class="divider"></span></li>
                 <li><i class="breadcrumb-arrow">&gt;</i><span class="divider"></span></li>
                 <li>@Html.ActionLink("Collèges", "Index", "Colleges")</li>
             </ul>
-            @*@Html.MvcSiteMap().SiteMapPath()*@
-        </div>
+            @Html.MvcSiteMap().SiteMapPath()
+        </div>*@
 
         <div id="content" class="container">
             @RenderBody()