From ba433e51a1c42ceda9aa8a82429196c33bfe2587 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 10 Mar 2017 11:57:25 +0100
Subject: [PATCH] style & Rate edition

---
 Yavsc/Models/Workflow/Activity.cs  | 26 +++++++++++++++++++-------
 Yavsc/Views/Activity/Delete.cshtml |  4 ++--
 Yavsc/Views/Activity/Edit.cshtml   | 15 +++++++++------
 Yavsc/Views/Activity/Index.cshtml  | 29 +++++++++++++++++++----------
 4 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/Yavsc/Models/Workflow/Activity.cs b/Yavsc/Models/Workflow/Activity.cs
index add92045..98605326 100644
--- a/Yavsc/Models/Workflow/Activity.cs
+++ b/Yavsc/Models/Workflow/Activity.cs
@@ -14,39 +14,43 @@ namespace Yavsc.Models.Workflow
     {
 
         [StringLength(512), Required, Key]
+        [Display(Name = "Code")]
         public string Code { get; set; }
         /// <summary>
         ///
         /// </summary>
         /// <returns></returns>
         [StringLength(512), Required()]
+        [Display(Name = "Nom")]
         public string Name { get; set; }
 
         [StringLength(512)]
+        [Display(Name = "Code du parent")]
         public string ParentCode { get; set; }
 
         [ForeignKey("ParentCode"), JsonIgnore]
+        [Display(Name = "Activité parent")]
         public virtual Activity Parent { get; set; }
 
         [InverseProperty("Parent"), JsonIgnore]
+        [Display(Name = "Activités filles")]
         public virtual List<Activity> Children { get; set; }
 
+        [Display(Name = "Description")]
         public string Description { get; set; }
-        /// <summary>
-        /// Name to associate to a performer in this activity domain
-        /// </summary>
-        [Obsolete]
-        public string ActorDenomination { get; set; }
 
+        [Display(Name = "Photo")]
         public string Photo { get; set; }
 
         [InverseProperty("Context")]
+        [DisplayAttribute(Name = "Services liés")]
         public List<Service> Services { get; set; }
 
         /// <summary>
         /// Moderation settings
         /// </summary>
         /// <returns></returns>
+        [DisplayAttribute(Name = "Groupe de modération")]
         public string ModeratorGroupName { get; set; }
 
         /// <summary>
@@ -55,34 +59,42 @@ namespace Yavsc.Models.Workflow
         /// Valide entre 0 et 100,
         /// Il démarre à 0.
         /// </summary>
-        [Range(0, 100)]
+        [Range(0, 100)][DisplayAttribute(Name = "Indice d'exposition")]
+        [DisplayFormatAttribute(DataFormatString="{0}%")]
         public int Rate { get; set; }
-        [DisplayAttribute(Name = "SettingsClass")]
+        [DisplayAttribute(Name = "Classe de paramétrage")]
         public string SettingsClassName { get; set; }
 
         [InverseProperty("Context")]
+        [Display(Name="Formulaires de commande")]
         public virtual List<CommandForm> Forms { get; set; }
 
+        [Display(Name="Date de création")]
         public DateTime DateCreated
         {
             get; set;
         }
 
+        [Display(Name="Createur")]
         public string UserCreated
         {
             get; set;
         }
 
+        [Display(Name="Date de dernière modification")]
         public DateTime DateModified
         {
             get; set;
         }
 
+        [Display(Name="Utilisateur ayant modifié le dernier")]
         public string UserModified
         {
             get; set;
         }
 
+        [Display(Name="Caché")]
+
         public bool Hidden { get; set; }
 
     }
diff --git a/Yavsc/Views/Activity/Delete.cshtml b/Yavsc/Views/Activity/Delete.cshtml
index d72db6a2..ce86243a 100644
--- a/Yavsc/Views/Activity/Delete.cshtml
+++ b/Yavsc/Views/Activity/Delete.cshtml
@@ -33,8 +33,8 @@
     
     <form asp-action="Delete">
         <div class="form-actions no-color">
-            <input type="submit" value="Delete" class="btn btn-default" /> |
-            <a asp-action="Index">Back to List</a>
+            <input type="submit" value="Delete" class="btn btn-danger" />
+            <a asp-action="Index"  class="btn btn-link">Back to List</a>
         </div>
     </form>
 </div>
diff --git a/Yavsc/Views/Activity/Edit.cshtml b/Yavsc/Views/Activity/Edit.cshtml
index 58d2776a..b78112b0 100644
--- a/Yavsc/Views/Activity/Edit.cshtml
+++ b/Yavsc/Views/Activity/Edit.cshtml
@@ -48,9 +48,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label asp-for="SettingsClassName" class="col-md-2 control-label">
-                @SR["SettingsClass"]
-            </label>
+            <label asp-for="SettingsClassName" class="col-md-2 control-label"></label>
             <div class="col-md-10">
                 <select asp-for="SettingsClassName" class="form-control" asp-items="@ViewBag.SettingsClassName">
                 </select>
@@ -58,14 +56,19 @@
             </div>
         </div>
         <div class="form-group">
-            <label asp-for="Hidden" class="col-md-2 control-label">
-                @SR["Hidden"]
-            </label>
+            <label asp-for="Hidden" class="col-md-2 control-label"></label>
             <div class="col-md-10">
                 <input asp-for="Hidden" class="form-control" />
                 <span asp-validation-for="Hidden" class="text-danger" />
             </div>
         </div>
+        <div class="form-group">
+            <label asp-for="Rate" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="Rate" class="form-control" />
+                <span asp-validation-for="Rate" class="text-danger" />
+            </div>
+        </div>
         <div class="form-group">
             <div class="col-md-offset-2 col-md-10">
                 <input type="submit" value="Save" class="btn btn-default" />
diff --git a/Yavsc/Views/Activity/Index.cshtml b/Yavsc/Views/Activity/Index.cshtml
index 713bcdd7..10a25aa6 100644
--- a/Yavsc/Views/Activity/Index.cshtml
+++ b/Yavsc/Views/Activity/Index.cshtml
@@ -12,10 +12,10 @@
 <table class="table">
     <tr>
         <th>
-          @Html.DisplayNameFor(model => model.Code)
+            @Html.DisplayNameFor(model => model.Name)
         </th>
         <th>
-           @SR["Name"]
+          @Html.DisplayNameFor(model => model.Code)
         </th>
 
         <th>
@@ -25,20 +25,26 @@
             @Html.DisplayNameFor(model => model.Photo)
         </th>
         <th>
-             @Html.DisplayNameFor(model => model.Parent)
+            @Html.DisplayNameFor(model => model.Parent)
+        </th>
+        <th>
+            @Html.DisplayNameFor(model => model.SettingsClassName)
+        </th>
+        <th>
+            @Html.DisplayNameFor(model => model.Children)
         </th>
         <th>
-            @SR["SettingsClass"]
+            @Html.DisplayNameFor(model => model.Rate)
         </th>
     </tr>
     
 @foreach (var item in Model) {
     <tr>
         <td>
-            @Html.DisplayFor(modelItem => item.Code)
+           <a name="@item.Code" class="btn btn-link"></a> @Html.DisplayFor(modelItem => item.Name)
         </td>
         <td>
-            @Html.DisplayFor(modelItem => item.Name)
+            @Html.DisplayFor(modelItem => item.Code)
         </td>
         <td>
             @Html.DisplayFor(modelItem => item.Description)
@@ -50,7 +56,7 @@
         <td>
             @if (item.Parent!=null) {
                 <text>
-            @Html.DisplayFor(modelItem => item.Parent)
+          <a href="#@item.ParentCode">@Html.DisplayFor(modelItem => item.Parent)</a>
             </text>
             }
         </td>
@@ -65,9 +71,12 @@
             @Html.DisplayFor(modelItem => item.Children)
         </td>
         <td>
-            <a asp-action="Edit" asp-route-id="@item.Code">Edit</a> |
-            <a asp-action="Details" asp-route-id="@item.Code">Details</a> |
-            <a asp-action="Delete" asp-route-id="@item.Code">Delete</a>
+            @Html.DisplayFor(modelItem => item.Rate)
+        </td>
+        <td>
+            <a asp-action="Edit" asp-route-id="@item.Code" class="btn btn-default">Edit</a> 
+            <a asp-action="Details" asp-route-id="@item.Code" class="btn btn-success">Details</a> 
+            <a asp-action="Delete" asp-route-id="@item.Code" class="btn btn-danger">Delete</a>
         </td>
     </tr>
 }