Hotfix Gewerksmanagement

GreenTree.Strohrmann.ERP.Web/Controllers/CraftController.cs

@@ -98,6 +98,7 @@ namespace GreenTree.Strohrmann.ERP.Web.Controllers
                 Name = model.Name,
                 CreationDate = model.CreationDate,
                 Customer = _eRPDbContext.Customers.Find(model.CustomerId),
+                Comment = model.Comment,
                 CreatedBy = User.Identity.Name,
                 CreatedOn = DateTime.Now
             };
@@ -172,6 +173,7 @@ namespace GreenTree.Strohrmann.ERP.Web.Controllers
             craft.Name = model.Name;
             craft.CreationDate = model.CreationDate;
             craft.Customer = _eRPDbContext.Customers.Find(model.CustomerId);
+            craft.Comment = model.Comment;
             craft.ChangedBy = User.Identity.Name;
             craft.ChangedOn = DateTime.Now;
             craft.CraftEmployees.Clear();

GreenTree.Strohrmann.ERP.Web/Models/Business/CraftModel.cs

@@ -3,6 +3,7 @@ using GreenTree.Strohrmann.ERP.Web.Extension;
 using GreenTree.Strohrmann.ERP.Web.Models.Search;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.EntityFrameworkCore.Internal;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -126,6 +127,22 @@ namespace GreenTree.Strohrmann.ERP.Web.Models.Business
             CraftMaterials = craft.CraftMaterials
                 .Select(cm => new CraftMaterialModel(cm))
                 .ToDictionary(cm => HtmlContentExtension.RandomId(), cm => cm);
+
+            var index = 0;
+
+            foreach (var item in CraftEmployees)
+            {
+                item.Value.Index = index;
+                index++;
+            }
+
+            index = 0;
+
+            foreach (var item in CraftMaterials)
+            {
+                item.Value.Index = index;
+                index++;
+            }
         }
 
         #endregion

GreenTree.Strohrmann.ERP.Web/Views/Craft/Create.cshtml

@@ -4,71 +4,11 @@
     ViewData["Title"] = "Neues Gewerk";
 }
 
-<script type="text/javascript">
-
-    function calculateEmployeeAggregation() {
-        var count = $("input[data-aggregation='employeeAmount']").length;
-
-        var avgAmount = $("input[data-aggregation='employeeAmount']").map(function () {
-            return parseFloat($(this).val());
-        }).get().avg();
-
-        var sumValues = $("input[data-aggregation='employeeValue']").map(function () {
-            return parseFloat($(this).val());
-        }).get().sum();
-
-        $("#aggEmployeeCount").text(count);
-        $("#aggEmployeeAmountAvg").text(isNaN(avgAmount) ? " -" : avgAmount + " Std.");
-        $("#aggEmployeeValueSum").text(isNaN(sumValues) ? " -" : sumValues + " €");
-    }
-
-    function calculateMaterialAggregation() {
-        var count = $("input[data-aggregation='materialCalculationFactor']").length;
-
-        var avgCalculationFactor = $("input[data-aggregation='materialCalculationFactor']").map(function () {
-            return parseFloat($(this).val());
-        }).get().avg();
-
-        var sumValues = $("input[data-aggregation='materialValue']").map(function () {
-            return parseFloat($(this).val());
-        }).get().sum();
-
-        $("#aggMaterialCount").text(count);
-        $("#aggMaterialCalculationFactorAvg").text(isNaN(avgCalculationFactor) ? " -" : avgCalculationFactor + " %");
-        $("#aggMaterialValueSum").text(isNaN(sumValues) ? " -" : sumValues + " €");
-	}
-
-    function addCraftEmployeePartial() {
-        $.ajax({
-            type: "GET",
-            url: '@Url.Action("AddCraftEmployeePartial")',
-            data: {
-                Index: $("#craftemployeelist").children(".row").length
-			},
-            success: function (data) { 
-                $("#craftemployeelist").append(data);
-                calculateEmployeeAggregation();
-            },
-            error: function (errorData) { console.error(errorData); }
-        });
-    }
-
-    function addCraftMaterialPartial() {
-        $.ajax({
-            type: "GET",
-            url: '@Url.Action("AddCraftMaterialPartial")',
-            data: {
-                Index: $("#craftmateriallist").children(".row").length
-			},
-            success: function (data) { 
-                $("#craftmateriallist").append(data);
-            },
-            error: function (errorData) { console.error(errorData); }
-        });
+@section Scripts {
+    @{
+		await Html.RenderPartialAsync("_CraftScriptPartial");
 	}
-
-</script>
-
+}
 <h1>Gewerk erstellen</h1>
 
 <h4>Neues Gewerk</h4>

GreenTree.Strohrmann.ERP.Web/Views/Craft/Edit.cshtml

@@ -4,70 +4,11 @@
     ViewData["Title"] = "Gewerk bearbeiten";
 }
 
-<script type="text/javascript">
-
-    function calculateEmployeeAggregation() {
-        var count = $("input[data-aggregation='employeeAmount']").length;
-
-        var avgAmount = $("input[data-aggregation='employeeAmount']").map(function () {
-            return parseFloat($(this).val());
-        }).get().avg();
-
-        var sumValues = $("input[data-aggregation='employeeValue']").map(function () {
-            return parseFloat($(this).val());
-        }).get().sum();
-
-        $("#aggEmployeeCount").text(count);
-        $("#aggEmployeeAmountAvg").text(isNaN(avgAmount) ? " -" : avgAmount + " Std.");
-        $("#aggEmployeeValueSum").text(isNaN(sumValues) ? " -" : sumValues + " €");
-    }
-
-    function calculateMaterialAggregation() {
-        var count = $("input[data-aggregation='materialCalculationFactor']").length;
-
-        var avgCalculationFactor = $("input[data-aggregation='materialCalculationFactor']").map(function () {
-            return parseFloat($(this).val());
-        }).get().avg();
-
-        var sumValues = $("input[data-aggregation='materialValue']").map(function () {
-            return parseFloat($(this).val());
-        }).get().sum();
-
-        $("#aggMaterialCount").text(count);
-        $("#aggMaterialCalculationFactorAvg").text(isNaN(avgCalculationFactor) ? " -" : avgCalculationFactor + " %");
-        $("#aggMaterialValueSum").text(isNaN(sumValues) ? " -" : sumValues + " €");
-	}
-
-    function addCraftEmployeePartial() {
-        $.ajax({
-            type: "GET",
-            url: '@Url.Action("AddCraftEmployeePartial")',
-            data: {
-                Index: $("#craftemployeelist").children(".row").length
-			},
-            success: function (data) { 
-                $("#craftemployeelist").append(data);
-                calculateEmployeeAggregation();
-            },
-            error: function (errorData) { console.error(errorData); }
-        });
-    }
-
-    function addCraftMaterialPartial() {
-        $.ajax({
-            type: "GET",
-            url: '@Url.Action("AddCraftMaterialPartial")',
-            data: {
-                Index: $("#craftmateriallist").children(".row").length
-			},
-            success: function (data) { 
-                $("#craftmateriallist").append(data);
-            },
-            error: function (errorData) { console.error(errorData); }
-        });
+@section Scripts {
+    @{
+		await Html.RenderPartialAsync("_CraftScriptPartial");
 	}
-
-</script>
+}
 
 <h1>Gewerk bearbeiten</h1>
 

GreenTree.Strohrmann.ERP.Web/Views/Craft/_CraftScriptPartial.cshtml

@@ -0,0 +1,65 @@
+<!-- Craft Views specified JavaScript element -->
+<script type="text/javascript">
+
+	function calculateEmployeeAggregation() {
+        var count = $("input[data-aggregation='employeeAmount']").length;
+
+        var avgAmount = $("input[data-aggregation='employeeAmount']").map(function () {
+            return parseFloat($(this).val());
+        }).get().avg();
+
+        var sumValues = $("input[data-aggregation='employeeValue']").map(function () {
+            return parseFloat($(this).val());
+        }).get().sum();
+
+        $("#aggEmployeeCount").text(count);
+        $("#aggEmployeeAmountAvg").text(isNaN(avgAmount) ? " -" : avgAmount.toFixed(2) + " Std.");
+        $("#aggEmployeeValueSum").text(isNaN(sumValues) ? " -" : sumValues + " €");
+    }
+
+    function calculateMaterialAggregation() {
+        var count = $("input[data-aggregation='materialCalculationFactor']").length;
+
+        var avgCalculationFactor = $("input[data-aggregation='materialCalculationFactor']").map(function () {
+            return parseFloat($(this).val());
+        }).get().avg();
+
+        var sumValues = $("input[data-aggregation='materialValue']").map(function () {
+            return parseFloat($(this).val());
+        }).get().sum();
+
+        $("#aggMaterialCount").text(count);
+        $("#aggMaterialCalculationFactorAvg").text(isNaN(avgCalculationFactor) ? " -" : avgCalculationFactor.toFixed(2) + " %");
+        $("#aggMaterialValueSum").text(isNaN(sumValues) ? " -" : sumValues + " €");
+    }
+
+    function addCraftEmployeePartial() {
+        $.ajax({
+            type: "GET",
+            url: '@Url.Action("AddCraftEmployeePartial")',
+            data: {
+                Index: $("#craftemployeelist").children(".row").length
+            },
+            success: function (data) {
+                $("#craftemployeelist").append(data);
+                calculateEmployeeAggregation();
+            },
+            error: function (errorData) { console.error(errorData); }
+        });
+    }
+
+    function addCraftMaterialPartial() {
+        $.ajax({
+            type: "GET",
+            url: '@Url.Action("AddCraftMaterialPartial")',
+            data: {
+                Index: $("#craftmateriallist").children(".row").length
+            },
+            success: function (data) {
+                $("#craftmateriallist").append(data);
+            },
+            error: function (errorData) { console.error(errorData); }
+        });
+    }
+
+</script>