浏览代码

FIX ActionsEdu: Corrige le tri des montants

olivier.massot 7 年之前
父节点
当前提交
5c76f82110
共有 2 个文件被更改,包括 11 次插入13 次删除
  1. 0 1
      CD67.FicheCollege.MVC/Scripts/cd67-main.js
  2. 11 12
      CD67.FicheCollege.MVC/Views/ActionsEdu/Index.cshtml

+ 0 - 1
CD67.FicheCollege.MVC/Scripts/cd67-main.js

@@ -6,5 +6,4 @@
         var url = $(this).data('url');
         var url = $(this).data('url');
         window.location.href = url;
         window.location.href = url;
     });
     });
-
 });
 });

+ 11 - 12
CD67.FicheCollege.MVC/Views/ActionsEdu/Index.cshtml

@@ -22,16 +22,16 @@
     <thead>
     <thead>
         <tr>
         <tr>
             <th>
             <th>
-                Axe
+                @Html.DisplayNameFor(model => action_model.Numero)
             </th>
             </th>
             <th>
             <th>
-                Thematique
+                @Html.DisplayNameFor(model => action_model.Nom)
             </th>
             </th>
             <th>
             <th>
-                @Html.DisplayNameFor(model => action_model.Numero)
+                Axe
             </th>
             </th>
             <th>
             <th>
-                @Html.DisplayNameFor(model => action_model.Nom)
+                Thematique
             </th>
             </th>
             <th>
             <th>
                 @Html.DisplayNameFor(model => action_model.Montant)
                 @Html.DisplayNameFor(model => action_model.Montant)
@@ -48,16 +48,9 @@
         </tr>
         </tr>
     </thead>
     </thead>
     <tbody>
     <tbody>
-        @foreach (ActionEdu item in Model.Obj.ActionsEdu.OrderBy(a => a.ActionEduThematique.ActionEduAxe.Ordre).ThenBy(a => a.ActionEduThematique.Ordre).ThenBy(a => a.Ordre))
+        @foreach (ActionEdu item in Model.Obj.ActionsEdu.OrderBy(a => a.Ordre))
         {
         {
             <tr data-url="@Url.Action("Details", new { id = item.Id })">
             <tr data-url="@Url.Action("Details", new { id = item.Id })">
-                <td>
-                    @Html.DisplayFor(model => item.ActionEduThematique.ActionEduAxe.Nom)
-                </td>
-        
-                <td>
-                    @Html.DisplayFor(model => item.ActionEduThematique.Nom)
-                </td>
                 <td>
                 <td>
                     @Html.DisplayFor(model => item.Numero)
                     @Html.DisplayFor(model => item.Numero)
                 </td>
                 </td>
@@ -68,6 +61,12 @@
                     </noscript>
                     </noscript>
                 </td>
                 </td>
                 <td>
                 <td>
+                    @Html.DisplayFor(model => item.ActionEduThematique.ActionEduAxe.Nom)
+                </td>
+                <td>
+                    @Html.DisplayFor(model => item.ActionEduThematique.Nom)
+                </td>
+                <td data-order="@item.Montant">
                     @Html.DisplayFor(model => item.Montant)
                     @Html.DisplayFor(model => item.Montant)
                 </td>
                 </td>
                 <td>
                 <td>