MoK: QB: Einträge werden jetzt alphabetisch sortiert.

This commit is contained in:
2023-11-13 16:40:39 +01:00
parent e5e0eec9b5
commit 3214d7d289
4 changed files with 8 additions and 16 deletions

View File

@@ -931,6 +931,8 @@ namespace BeWoPlanerMobil.Controllers
employeeSignatures.ToList(),
employeeSignatureState);
var confirmationReceiptResults = new List<QuittierungsbelegResult>();
reportObjects.DoForEach(reportObject =>
{
var quittierungsbelegItems = new List<QuittierungsbelegItem>();
@@ -997,8 +999,8 @@ namespace BeWoPlanerMobil.Controllers
quittierungsbelegItem.HasEmployeeSignature = employeeSignatureServiceRecordOids.Contains(serviceRecordOid);
}
Model.ConfirmationReceiptObject.ConfirmationReceiptResultList.Add(
item: new QuittierungsbelegResult
confirmationReceiptResults.Add(
item: new QuittierungsbelegResult
(
$"{reportObject.CustomerLastName}, {reportObject.CustomerFirstName}",
quittierungsbelegItems,
@@ -1013,6 +1015,8 @@ namespace BeWoPlanerMobil.Controllers
);
});
Model.ConfirmationReceiptObject.ConfirmationReceiptResultList.AddRangeIfElementsNotIn(confirmationReceiptResults.OrderBy(o => o.CustomerName));
if(Model.ConfirmationReceiptObject.ConfirmationReceiptResultList.All(qbItem => qbItem.Items.Count == 0))
{
TempData["HasWarningMessage"] = true;

View File

@@ -130,7 +130,7 @@
}
$(window).ready(function() {
@if(ViewData["Testmeldung"] is string testMessage)
@if(Html.IsInDebugMode() && ViewData["Testmeldung"] is string testMessage)
{
<text>
showMessagePopupWithHtml("Fehler", "<div class='alert' role='alert'>@ViewData["Testmeldung"]</div>");

View File

@@ -1,19 +1,8 @@
@using BeWoPlanerMobil.Models;
@using BeWoPlanerMobil.Util
@using BS.Shared
@using BS.Shared.Extensions
@model CustomerModel
@*
ToDos:
1. Formularvalidierung
2. Ganztagsfunktionalität einbauen
3. Controller-Funktionen implementieren:
1. Bearbeiten einer existierenden Abwesenheit
2. Anlegen einer neuen Abwesenheit
*@
<script type="text/javascript">
$(function () {
$("#customer-absence-time-start-date-picker, #customer-absence-time-end-date-picker").datetimepicker({
@@ -39,8 +28,6 @@
return;
}
logInfo2(`max width: ${getMaxWidth("customer-absence-time-prepend")}`);
$(".customer-absence-time-prepend").width(getMaxWidth("customer-absence-time-prepend"));
});
} catch(error) {

View File

@@ -43,6 +43,7 @@
showMessagePopupWithHtml("Fehler", "<div class='alert alert-danger' role='alert'>" + result + "</div>");
} else if(result !== undefined && result !== null && result.length === 1) {
$("#customer-absence-time-modal-body").load('@Url.Action("LoadAbsenceTimeToForm", "Customer")', function () {
calcAbsenceTimePrependWidth();
$("#customer-absence-times-form-popup").modal("show");
});
}