From 2ff705bfb029bb78f1c2d018f98879adb275ec41 Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Thu, 12 Sep 2024 14:55:35 +0200 Subject: [PATCH] Diverse Bugfixes und Verbesserungen im MoK Dateien Hochladen im MoK --- BeWo/View/Detail/CustomerView2.xaml | 69 +- BeWo/View/Detail/Report/QueryView.xaml.cs | 2 +- BeWo/View/HomeView.xaml | 1 - BeWo/View/HomeView.xaml.cs | 9 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 1 + BeWoPlanerMobil/Content/style.css | 45 ++ BeWoPlanerMobil/Content/style.css.map | 2 +- BeWoPlanerMobil/Content/style.scss | 45 ++ .../Controllers/CustomerController.cs | 240 ++++++- BeWoPlanerMobil/Controllers/MainController.cs | 176 +++-- .../Controllers/ReportController.cs | 27 +- .../Controllers/ReportViewerController.cs | 232 +++++- BeWoPlanerMobil/Models/AbstractModel.cs | 17 +- BeWoPlanerMobil/Models/CustomerModel.cs | 5 +- BeWoPlanerMobil/Models/MainModel.cs | 2 + BeWoPlanerMobil/Models/ReportViewerModel.cs | 44 +- .../Scripts/bs-custom-file-input.min.js | 7 + .../Scripts/ownSoft-Scripts/mobileUtils.js | 47 +- .../ownSoft-Scripts/view-scripts/main.js | 5 +- .../ownSoft-Scripts/view-scripts/report.js | 59 -- .../Util/FormCollectionConstants.cs | 2 + BeWoPlanerMobil/Util/MobileUtils.cs | 4 +- .../Views/Customer/Customer.cshtml | 109 ++- .../Customer/CustomerBargeldkassen.cshtml | 6 +- ...omerBargeldtransaktionenFormPartial.cshtml | 2 +- .../Views/Customer/DocumentPartial.cshtml | 333 ++++++++- .../Views/Main/GroupBookingFormPartial.cshtml | 30 +- .../Views/Main/GroupBookingPartial.cshtml | 4 +- BeWoPlanerMobil/Views/Main/Main.cshtml | 70 +- .../Views/Main/MultiBookingFormPartial.cshtml | 22 + .../Views/Main/MultiBookingPartial.cshtml | 4 +- .../Main/ServiceRecordListPartial.cshtml | 204 +++--- .../Views/Main/SingleBookingPartial.cshtml | 668 ++++++++++-------- ...ConfirmationReceiptSignaturePartial.cshtml | 2 +- BeWoPlanerMobil/Views/Report/Report.cshtml | 254 ++++++- .../BerichteFormPartialView.cshtml | 404 +++++++---- .../Views/ReportViewer/ReportViewer.cshtml | 7 +- .../ReportViewerFormPartial.cshtml | 8 +- .../Scheduler/AppointmentFormPartial.cshtml | 6 +- .../AppointmentIntervalFinderPartial.cshtml | 6 +- .../CustomerFilterSelectionPartial.cshtml | 2 +- .../EmployeeForFilteringPartial.cshtml | 2 +- .../Scheduler/OneDaySchedulerPartial.cshtml | 2 +- .../Views/Scheduler/Scheduler.cshtml | 4 +- .../Views/Shared/BeWoReportPartial.cshtml | 2 +- BeWoPlanerMobil/Views/Shared/Error.cshtml | 8 +- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 73 +- Service/Plugins/PluginLoader.cs | 5 +- 48 files changed, 2388 insertions(+), 890 deletions(-) create mode 100644 BeWoPlanerMobil/Scripts/bs-custom-file-input.min.js diff --git a/BeWo/View/Detail/CustomerView2.xaml b/BeWo/View/Detail/CustomerView2.xaml index a5de10774..40bc8eeff 100644 --- a/BeWo/View/Detail/CustomerView2.xaml +++ b/BeWo/View/Detail/CustomerView2.xaml @@ -160,11 +160,12 @@ - + - + + @@ -176,13 +177,12 @@ - - + + - + - @@ -201,18 +201,18 @@ @@ -242,7 +242,8 @@ - + + @@ -263,8 +264,8 @@ - - + + @@ -289,7 +290,8 @@ - + + @@ -312,7 +314,8 @@ - + + @@ -350,17 +353,17 @@ - - - - - + + + + + - + @@ -505,7 +508,7 @@ - + diff --git a/BeWo/View/Detail/Report/QueryView.xaml.cs b/BeWo/View/Detail/Report/QueryView.xaml.cs index 6089df2cd..d749dbdde 100644 --- a/BeWo/View/Detail/Report/QueryView.xaml.cs +++ b/BeWo/View/Detail/Report/QueryView.xaml.cs @@ -754,7 +754,7 @@ namespace BeWo.View.Detail.Report }, rstr => this.Dispatch(delegate { - DataTable table = BS.Shared.Core.Utils.XMLDeserializeFromString(rstr); + var table = Utils.XMLDeserializeFromString(rstr); datagrid_result.ItemsSource = table; SetOidColumnsInvisible(); diff --git a/BeWo/View/HomeView.xaml b/BeWo/View/HomeView.xaml index 4dd5a4e3c..12e8b7c37 100644 --- a/BeWo/View/HomeView.xaml +++ b/BeWo/View/HomeView.xaml @@ -198,7 +198,6 @@ + + - @Html.DropDownListFor(m => m.SelectedCustomerOid, Model.CustomerListItems, new { onchange = "submitCustomerSelectionForm();", @class = "custom-select" }) + } -
+
@if(Model?.SelectedJsonCustomer != null) { @* ----- Details ----- *@ @@ -129,7 +206,7 @@ var inputDisabled = !AbstractModel.HasRightToEditCustomers ? "disabled" : string.Empty;
-
+
@@ -226,7 +303,7 @@
-
+
Krankenkasse
@@ -238,8 +315,8 @@
-
- Versichertennummer +
+ Versichertennr.
@@ -250,7 +327,7 @@
-
+
Versichertenstatus
@@ -261,7 +338,7 @@
-
+
@@ -318,7 +395,7 @@
-
+
@@ -375,7 +452,7 @@
-
+
@@ -766,7 +843,7 @@
-
+
@Html.Partial("DocumentPartial", Model)
@@ -1030,7 +1107,7 @@
-
Abwesenheit hinzufügen
+
Abwesenheit hinzufügen
diff --git a/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml index 2682d729d..7ab09aa00 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml @@ -676,7 +676,7 @@
- + @@ -696,7 +696,7 @@
-
Neue Zahlung hinzufügen
+
Neue Zahlung hinzufügen
@@ -718,7 +718,7 @@
- + diff --git a/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml index c53d2f5b0..53c55f2d4 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml @@ -268,7 +268,7 @@
-
+
diff --git a/BeWoPlanerMobil/Views/Customer/DocumentPartial.cshtml b/BeWoPlanerMobil/Views/Customer/DocumentPartial.cshtml index 83f7c2a2d..f270189c8 100644 --- a/BeWoPlanerMobil/Views/Customer/DocumentPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/DocumentPartial.cshtml @@ -1,29 +1,270 @@ @using BeWoPlanerMobil.Models; +@using BeWoPlanerMobil.Util @using BS.Shared.DataContracts @model CustomerModel @helper BuildFolderTreeBranch(BeWoFolderDC folder) { -
-
- @folder.Name +
+
+
+
+ + + +
+ +
+ +
+ + + @if(folder.BeWoFolderOid.HasValue) + { + + + + } +
+
+
-
+
@foreach(var file in folder.Files) { - @Html.ActionLink(file.FileName, "DownloadFile", new { fileOid = file.FileAttachmentOid }, new { @class = "pl-2 px-2" })
+
+
+
+
+ + + +
+ +
+ +
+ + + Herunterladen + + + +
+
+
+
+
+
+
+
+ Hinterlegt am +
+
+ @file.InsertedOn.ToString("dd.MM.yyyy") +
+
+
+
+ Hinterlegt von +
+
+ @file.InsertedBy +
+
+ +
+ @{ + var fileDescription = file.Description ?? string.Empty; + } + + + +
+
+
+
} @foreach(var subFolder in folder.SubFolders) @@ -52,3 +293,83 @@ Write(BuildFolderTree()); } } + + + + + + \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml b/BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml index c0f4b0fcc..83ea5748d 100644 --- a/BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml @@ -34,7 +34,7 @@ $("#employees-button, #category-select, #leistung-select, " + "#start-date, #end-date, #start-time, #end-time, #duration, " + - "#distance, textarea, #reset-button, #create-button, #textbausteine-button, #hours-minutes-dropdown-btn, #marker-cb") + "#distance, textarea, #reset-button, #create-button, #textbausteine-button, #hours-minutes-dropdown-btn, #marker-cb, #betrag") .prop("disabled", (checkedCheckboxes.length > 0 ? false : true)); $("#goals-tree").load("@Url.Action("ReloadGoals")", function () { @@ -136,6 +136,34 @@
} + @* ----- Betrag ----- *@ + @if(Model.ShowBetrag) + { + var betrag = string.Empty; + if(Model.SelectedServiceRecord?.Betrag != null && Model.SelectedServiceRecord.Betrag.Value > 0) + { + betrag = Model.SelectedServiceRecord.Betrag.Value.ToString("#.00"); + } + +
+
+
+
+
+
+ Betrag +
+
+ +
+
€
+
+
+
+
+
+ } + @* Trennstrich *@
diff --git a/BeWoPlanerMobil/Views/Main/GroupBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/GroupBookingPartial.cshtml index 2f172f2a9..53093c233 100644 --- a/BeWoPlanerMobil/Views/Main/GroupBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/GroupBookingPartial.cshtml @@ -94,7 +94,7 @@
-
Gruppen und Hilfepläne für Gruppenbuchung
+
Gruppen und Hilfepläne für Gruppenbuchung
@@ -117,7 +117,7 @@
-
Mitarbeiter hinzufügen
+
Mitarbeiter hinzufügen
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml index 8cf7c4643..111ff8fe3 100644 --- a/BeWoPlanerMobil/Views/Main/Main.cshtml +++ b/BeWoPlanerMobil/Views/Main/Main.cshtml @@ -70,8 +70,6 @@ return "@Model.EinheitZeiterfassung" === "0"; } - - $(function() { $("#start-date-picker").datetimepicker({ locale: "de", @@ -147,17 +145,17 @@ var isSupportConceptSelected = supportConceptOid !== -1; - $("#employeesDropDown, #category-select, #leistung-select, " + + $("#employeesDropDown, #single-booking-dropdown-employees-menu, #category-select, #leistung-select, " + "#start-date, #end-date, #start-time, #end-time, #duration, " + "#distance, #textbausteine-button, #goals-button, textarea, #reset-button, " + - "#create-button, #statistics-button, #timeFrameSelect, #hours-minutes-dropdown-btn, #marker-cb").prop("disabled", (isSupportConceptSelected ? false : true)); + "#create-button, #statistics-button, #timeFrameSelect, #hours-minutes-dropdown-btn, #marker-cb, #betrag").prop("disabled", (isSupportConceptSelected ? false : true)); if("@Model.IsInGroupBookingMode".toLowerCase() === "true") { var hasSelectedSupportConcepts = "@Model.SelectedConceptCostBearerRelations.Any()".toLowerCase() === "true"; - $("#employees-button, #category-select, #leistung-select, " + + $("#employees-button, #single-booking-dropdown-employees-menu, #category-select, #leistung-select, " + "#start-date, #end-date, #start-time, #end-time, #duration, " + - "#distance, textarea, #reset-button, #create-button, #textbausteine-button, #hours-minutes-dropdown-btn, #marker-cb").prop("disabled", (hasSelectedSupportConcepts ? false : true)); + "#distance, textarea, #reset-button, #create-button, #textbausteine-button, #hours-minutes-dropdown-btn, #marker-cb, #betrag").prop("disabled", (hasSelectedSupportConcepts ? false : true)); } $("#fehlerdetail-textarea").prop("disabled", false); @@ -167,20 +165,7 @@ toggleMultiBookingForm(isMultiBookingFormDisabled); } - - //var categorySelectId = "category-select"; - //var leistungSelectId = "leistung-select"; - - @*if("@Model.IsInMultiBookingMode".toLowerCase() === "true") { - categorySelectId = "mb-category-select"; - leistungSelectId = "mb-leistung-select"; - }*@ - - @*if("@Model.IsInGroupBookingMode".toLowerCase() === "false") { - loadServiceDescriptions("category-select", "leistung-select", 'textmodule-container', 'tree'); - }*@ - initializeTimeInputs(); initializeSignatureImagePopup(); @@ -344,19 +329,23 @@ } function setInputFilter(durationId, distanceId, hoursMinutesDropdownBtnId) { - $("#" + durationId).inputFilter(function (value) { + $(`#${durationId}`).inputFilter(function (value) { var result = /^\d*$/; - var dropdownButton = $("#" + hoursMinutesDropdownBtnId); + var dropdownButton = $(`#${hoursMinutesDropdownBtnId}`); - if (dropdownButton.length && dropdownButton.text() === "Stunden" || getIsZeiterfassungseinheitInMinutes() === false) { - result = /^-?\d*[.,]?\d*$/; + if(dropdownButton.length && dropdownButton.text() === "Stunden" || getIsZeiterfassungseinheitInMinutes() === false) { + result = /^\d*[.,]?\d*$/; } return result.test(value); }); - $("#" + distanceId).inputFilter(function(value) { - return /^-?\d*[.,]?\d*$/.test(value); + $(`#${distanceId}`).inputFilter(function(value) { + return /^\d*[.,]?\d*$/.test(value); + }); + + $(`#betrag`).inputFilter(function (value) { + return /^\d*([.,]?\d{0,2})?$/.test(value); }); } @@ -456,7 +445,7 @@ } -
+
@if(AbstractModel.IsAllowedToSeeSupportConceptFilter) { @@ -471,7 +460,7 @@
@using(Html.BeginForm("SetShowExpiredSupportConcepts", "Main", FormMethod.Post)) { -
+
@Html.CheckBoxFor(m => m.ShowExpiredSupportConcepts, new { onchange = "submitForm(this)", @class = "custom-control-input" }) @Html.LabelFor(m => m.ShowExpiredSupportConcepts, new { @class = "custom-control-label" })
@@ -483,7 +472,7 @@
@using(Html.BeginForm("SetGroupBookingMode", "Main", FormMethod.Post)) { -
+
@Html.CheckBoxFor(m => m.IsInGroupBookingMode, new { onchange = "submitForm(this)", @class = "custom-control-input" }) @Html.LabelFor(m => m.IsInGroupBookingMode, new { @class = "custom-control-label" })
@@ -496,7 +485,7 @@
@using(Html.BeginForm("SetMultiBookingMode", "Main", FormMethod.Post)) { -
+
@Html.CheckBoxFor(m => m.IsInMultiBookingMode, new { onchange = "submitForm(this)", @class = "custom-control-input" }) @Html.LabelFor(m => m.IsInMultiBookingMode, new { @class = "custom-control-label" })
@@ -507,7 +496,7 @@
@* ----- Einzelbuchung ----- *@ -
+
@if(!Model.IsInGroupBookingMode && !Model.IsInMultiBookingMode) { @Html.Partial("SingleBookingPartial", Model) @@ -515,7 +504,7 @@
@* ----- Gruppenbuchung ----- *@ -
+
@if(Model.IsInGroupBookingMode && !Model.IsInMultiBookingMode) {
@@ -525,7 +514,7 @@
@* ----- Mehrfachbuchung ----- *@ -
+
@if(Model.IsInMultiBookingMode && !Model.IsInGroupBookingMode) { @Html.Partial("MultiBookingPartial", Model); @@ -537,7 +526,7 @@
-
Textbausteine
+
Textbausteine
@@ -555,7 +544,7 @@
@* ----- Unterschriften-Layover ----- *@ -
+
@@ -639,7 +628,7 @@
- + @@ -664,7 +653,7 @@
-
+
@@ -686,7 +675,7 @@
-
Bewertungsskala
+
Bewertungsskala
@@ -717,7 +706,7 @@
-
Passwort ändern
+
Passwort ändern
@@ -792,7 +781,7 @@
- + @@ -846,6 +835,7 @@ + } @@ -854,7 +844,7 @@
-
Ziele und Maßnahmen
+
Ziele und Maßnahmen
diff --git a/BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml b/BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml index dab825812..68fb4cc0d 100644 --- a/BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml @@ -98,6 +98,28 @@
} + @* ----- Betrag ----- *@ + @if(Model.ShowBetrag) + { +
+
+
+
+
+
+ Betrag +
+
+ +
+
€
+
+
+
+
+
+ } + @* Trennlinie *@
diff --git a/BeWoPlanerMobil/Views/Main/MultiBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/MultiBookingPartial.cshtml index 7d4098f89..b5b8c8a64 100644 --- a/BeWoPlanerMobil/Views/Main/MultiBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/MultiBookingPartial.cshtml @@ -132,7 +132,7 @@
-
Gruppen und Hilfepläne für Gruppenbuchung
+
Gruppen und Hilfepläne für Gruppenbuchung
@@ -155,7 +155,7 @@
-
Mitarbeiter hinzufügen
+
Mitarbeiter hinzufügen
diff --git a/BeWoPlanerMobil/Views/Main/ServiceRecordListPartial.cshtml b/BeWoPlanerMobil/Views/Main/ServiceRecordListPartial.cshtml index f93f68aff..f80ac13ac 100644 --- a/BeWoPlanerMobil/Views/Main/ServiceRecordListPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/ServiceRecordListPartial.cshtml @@ -72,8 +72,6 @@ showErrorPopup(error); } } - - @{ @@ -161,110 +159,105 @@ } - foreach(var serviceRecord in Model.ServiceRecords) + foreach(var serviceRecord in Model.ServiceRecords) + { + if(serviceRecord.Start == null || serviceRecord.End == null) + { + continue; + } + + var start = serviceRecord.Start.Value; + var end = serviceRecord.End.Value; + var hasSignatureStr = serviceRecord.SignatureOid.HasValue ? "JA" : "NEIN"; + + var duration = (end - start).TotalMinutes; + + var roundedDuration = MobileUtils.GetDecimalValueWithMaxDecimal(serviceRecord.RoundedDuration, 2); + + if(serviceRecord.ServiceDescription.Category.Percentage > 0 && serviceRecord.ServiceDescription.Category.Percentage < 100) + { + roundedDuration = roundedDuration * serviceRecord.ServiceDescription.Category.Percentage / 100; + } + + var durationStr = serviceRecord.GroupOid.HasValue ? string.Format("{0:###0.#} ({0:###0.#})", roundedDuration) : $"{duration:###0.#} ({roundedDuration:###0.#})"; + + var massnahmenString = string.Empty; + var zieleString = string.Empty; + + if(serviceRecord.Goals != null && serviceRecord.Goals.Count > 0) + { + foreach(var goal in serviceRecord.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptGoalType || g.Type == ValueListEntryType.SupportConceptIndividualGoalType)) + { + if(goal.Abbreviation != null && goal.TypeDescription != null) + { + massnahmenString += $"{goal.Abbreviation}: {goal.TypeDescription}"; + } + else if(goal.Abbreviation is null && goal.TypeDescription != null) + { + massnahmenString += goal.TypeDescription; + } + else if(goal.Abbreviation != null && goal.TypeDescription is null) + { + massnahmenString += goal.Abbreviation; + } + +#if DEBUG + if(goal.RatingTypeOid.HasValue) + { + var goalRating = Model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value)); + + if(goalRating?.DisplayName != null && goalRating.DisplayName.Length > 0) { - if(serviceRecord.Start == null || serviceRecord.End == null) - { - continue; - } - - var start = serviceRecord.Start.Value; - var end = serviceRecord.End.Value; - var hasSignatureStr = serviceRecord.SignatureOid.HasValue ? "JA" : "NEIN"; - - var duration = (end - start).TotalMinutes; - - var roundedDuration = MobileUtils.GetDecimalValueWithMaxDecimal(serviceRecord.RoundedDuration, 2); - - if(serviceRecord.ServiceDescription.Category.Percentage > 0 && serviceRecord.ServiceDescription.Category.Percentage < 100) - { - roundedDuration = roundedDuration * serviceRecord.ServiceDescription.Category.Percentage / 100; - } - - var durationStr = serviceRecord.GroupOid.HasValue ? string.Format("{0:###0.#} ({0:###0.#})", roundedDuration) : $"{duration:###0.#} ({roundedDuration:###0.#})"; - - var massnahmenString = string.Empty; - var zieleString = string.Empty; - - if(serviceRecord.Goals != null && serviceRecord.Goals.Count > 0) - { - foreach(var goal in serviceRecord.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptGoalType || g.Type == ValueListEntryType.SupportConceptIndividualGoalType)) - { - if(goal.Abbreviation != null && goal.TypeDescription != null) - { - massnahmenString += $"{goal.Abbreviation}: {goal.TypeDescription}"; - } - else if(goal.Abbreviation is null && goal.TypeDescription != null) - { - massnahmenString += goal.TypeDescription; - } - else if(goal.Abbreviation != null && goal.TypeDescription is null) - { - massnahmenString += goal.Abbreviation; - } - -#if DEBUG - if(goal.RatingTypeOid.HasValue) - { - var goalRating = Model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value)); - - if(goalRating?.DisplayName != null && goalRating.DisplayName.Length > 0) - { - massnahmenString += $" ({goalRating.DisplayName})"; - } - } + massnahmenString += $" ({goalRating.DisplayName})"; + } + } #endif - if(serviceRecord.Goals.IndexOf(goal) < serviceRecord.Goals.Count - 1) - { - massnahmenString += ", "; - } - } + if(serviceRecord.Goals.IndexOf(goal) < serviceRecord.Goals.Count - 1) + { + massnahmenString += ", "; + } + } - if(serviceRecord.ServiceRecordOid.HasValue && Model.ServiceRecordOids2GoalHeader.ContainsKey(serviceRecord.ServiceRecordOid.Value)) - { - var ziele = serviceRecord.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == ValueListEntryType.SupportConceptGoalCategoryType).ToList(); + if(serviceRecord.ServiceRecordOid.HasValue && Model.ServiceRecordOids2GoalHeader.ContainsKey(serviceRecord.ServiceRecordOid.Value)) + { + var ziele = serviceRecord.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == ValueListEntryType.SupportConceptGoalCategoryType).ToList(); - foreach(var ziel in ziele) - { - if(ziel.Abbreviation != null && ziel.TypeDescription != null) - { - zieleString += $"{ziel.Abbreviation}: {ziel.TypeDescription} "; - } - else if(ziel.Abbreviation is null && ziel.TypeDescription != null) - { - zieleString += ziel.TypeDescription; - } - else if(ziel.Abbreviation != null && ziel.TypeDescription is null) - { - zieleString += ziel.Abbreviation; - } + foreach(var ziel in ziele) + { + if(ziel.Abbreviation != null && ziel.TypeDescription != null) + { + zieleString += $"{ziel.Abbreviation}: {ziel.TypeDescription} "; + } + else if(ziel.Abbreviation is null && ziel.TypeDescription != null) + { + zieleString += ziel.TypeDescription; + } + else if(ziel.Abbreviation != null && ziel.TypeDescription is null) + { + zieleString += ziel.Abbreviation; + } #if DEBUG - if(ziel.RatingTypeOid.HasValue) - { - var zielbewertung = Model.GoalRatingTypes.FirstOrDefault(goalRatingType => goalRatingType.RatingTypeOid.HasValue && goalRatingType.RatingTypeOid.Equals(ziel.RatingTypeOid.Value)); + if(ziel.RatingTypeOid.HasValue) + { + var zielbewertung = Model.GoalRatingTypes.FirstOrDefault(goalRatingType => goalRatingType.RatingTypeOid.HasValue && goalRatingType.RatingTypeOid.Equals(ziel.RatingTypeOid.Value)); - if(zielbewertung?.DisplayName != null && zielbewertung.DisplayName.Length > 0) - { - zieleString += $" ({zielbewertung.DisplayName})"; - } - } + if(zielbewertung?.DisplayName != null && zielbewertung.DisplayName.Length > 0) + { + zieleString += $" ({zielbewertung.DisplayName})"; + } + } #endif - zieleString += ", "; - } + zieleString += ", "; + } + } - //foreach(var goalHeader in Model.ServiceRecordOids2GoalHeader[serviceRecord.ServiceRecordOid.Value]) - //{ - // zieleString += $"{goalHeader}, "; - //} - } + zieleString = zieleString.TrimEnd(' ').TrimEnd(','); + } - zieleString = zieleString.TrimEnd(' ').TrimEnd(','); - } - - var cardBackground = serviceRecord.ServiceRecordType == ServiceRecordTypeId.Content ? "bg-service-record-marked" : serviceRecord.GroupOid.HasValue ? "bg-bewo-group-booking" : string.Empty; + var cardBackground = serviceRecord.ServiceRecordType == ServiceRecordTypeId.Content ? "bg-service-record-marked" : serviceRecord.GroupOid.HasValue ? "bg-bewo-group-booking" : string.Empty;
@@ -371,7 +364,7 @@
} - + if(serviceRecord.Goals.Any(goal => goal.Type == ValueListEntryType.SupportConceptGoalType || goal.Type == ValueListEntryType.SupportConceptIndividualGoalType)) {
@@ -429,6 +422,25 @@
} + @if(Model.ShowBetrag) + { + var betrag = string.Empty; + + if(serviceRecord.Betrag.HasValue && serviceRecord.Betrag.Value > 0) + { + betrag = serviceRecord.Betrag.Value.ToString("#.00") + " €"; + } + +
+
+ Betrag: +
+
+ @betrag +
+
+ } + @{ var header1 = "Dokumentation"; if(Model.NumberOfDokuTypes >= 1) @@ -579,7 +591,7 @@
-
Einmal-Unterschrift
+
Einmal-Unterschrift
diff --git a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml index cfc9192aa..11d555f06 100644 --- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml @@ -15,7 +15,7 @@ } } - @using(Html.BeginForm("ResetSingleBookingForm", "Main", FormMethod.Post, new { Id = "reset-single-booking-form-form" })) @@ -121,7 +279,7 @@
-
Hilfeplanauswahl
+
Hilfeplanauswahl
@@ -183,16 +341,51 @@ @* ----- Einzelbuchung: Mitarbeiter ----- *@
-
-
-
-
Mitarbeiter
+
+ @{ + var employeeButtonValue = "Mitarbeiter"; + + if(Model.SelectedEmployee != null) + { + employeeButtonValue = Model.SelectedEmployee.DetailDescription; + } + } + +
+
+
+ Mitarbeiter +
+
- @Html.DropDownListFor(m => m.SelectedEmployeeOid, Model.EmployeeListItems, new { id = "employeesDropDown", @class = "custom-select", onchange = "setSelectedEmployee()" })
+ + + + + @* ----- Einzelbuchung: Ziele ----- *@ @if(Model.SelectedSupportConcept != null && Model.SelectedSupportConcept.Goals.Any()) { @@ -211,6 +404,8 @@ } + + @* ----- Einzelbuchung: Kategorie & Leistung ----- *@
@Html.Partial("Category2ServiceDescriptionPartial", Model) @@ -230,6 +425,34 @@
} + + @* ----- Betrag ----- *@ + @if(Model.ShowBetrag) + { + var betrag = string.Empty; + if(Model.SelectedServiceRecord?.Betrag != null && Model.SelectedServiceRecord.Betrag.Value > 0) + { + betrag = Model.SelectedServiceRecord.Betrag.Value.ToString("#.00"); + } + +
+
+
+
+
+
+ Betrag +
+
+ +
+
€
+
+
+
+
+
+ }
@@ -352,7 +575,7 @@ @labelText
- + @if(Model.IsZeiterfassungInStdMin) {
@@ -484,303 +707,196 @@ { if(Model.SelectedSupportConcept != null || Model.CostBearer2SupportConceptOid == -2) { + var defaultStartDate = DateTime.Now.GetFirstOfMonth().ToShortDateString(); + var defaultEndDate = DateTime.Today.ToShortDateString(); +
- @using(Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectServiceRecordForm" })) - { -
-
-
- + + + + + + + + + +
+
+
+ +
+
+ + @*----- Anzahl Tage: [Nummern-Input] ----- *@ +
+
+
+
+
+ Anzahl Tage: +
+ +
+
+
+
+ + @*----- Zeitraum wählen: [Von-Datum] bis [Bis-Datum] erster des Monats bis aktuelles Datum ----- *@ +
+
+
+
+
+
+
+
+ Von +
+ +
+
+
+
+
+
+
+
+
+
+ Bis +
+ +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Monat +
+ - -
-
-
- -
-
- - @*----- Anzahl Tage: [Nummern-Input] ----- *@ -
-
-
-
-
- Anzahl Tage: -
- -
- - @*----- Zeitraum wählen: [Von-Datum] bis [Bis-Datum] erster des Monats bis aktuelles Datum ----- *@ - var defaultStartDate = DateTime.Now.GetFirstOfMonth().ToShortDateString(); - var defaultEndDate = DateTime.Today.ToShortDateString(); -
-
-
-
-
-
-
-
- Von -
- -
-
-
-
-
-
-
-
-
-
- Bis -
- -
-
-
-
-
-
+
+
+
+
+ Jahr
-
-
-
- -
-
-
-
-
- Monat -
- -
-
-
-
-
-
-
- Jahr -
- + @{ + var heuer = DateTime.Today.Year; + for(var year = heuer + 1; year >= heuer - 10; year--) + { + } - -
+ } +
- } +
} - +
@Html.Partial("ServiceRecordListPartial", Model)
- - }
@*----- /Liste mit den Einträgen und dem Auswahl-Select ----- *@ - -
@using(Html.BeginForm("DeleteSignature", "Main", FormMethod.Post, new { id = "delete-signature-form" })) diff --git a/BeWoPlanerMobil/Views/Report/ConfirmationReceiptSignaturePartial.cshtml b/BeWoPlanerMobil/Views/Report/ConfirmationReceiptSignaturePartial.cshtml index 0f0898e47..4cd1c05c7 100644 --- a/BeWoPlanerMobil/Views/Report/ConfirmationReceiptSignaturePartial.cshtml +++ b/BeWoPlanerMobil/Views/Report/ConfirmationReceiptSignaturePartial.cshtml @@ -39,7 +39,7 @@ }); -
+
+
- @Html.DropDownListFor(m => m.SelectedCustomerOid, Model.CustomerListItems, new { id = "customers-drop-down", @class = "custom-select", onchange = "onCustomerSelectionChange()" })
@@ -248,12 +440,33 @@
+ @{ + var teamButtonValue = Model.SelectedTeam?.DetailDescription ?? string.Empty; + }
-
- Team +
Team
+
+
+ +
- @Html.DropDownListFor(m => m.SelectedTeamOid, Model.Teams, new { id = "teams-drop-down", @class = "custom-select", onchange = "checkForExistingSignature()" }) + @*@Html.DropDownListFor(m => m.SelectedTeamOid, Model.Teams, new { id = "teams-drop-down", @class = "custom-select", onchange = "checkForExistingSignature()" })*@
@@ -264,7 +477,7 @@
- + @* Nur für ausgewählten Mitarbeiter *@
@Html.CheckBoxFor(m => m.IsForSelectedEmployeesOnly, new { onchange = "setIsOnlyForSelectedEmployee()", @class = "custom-control-input", id = "selected-employee-cb", data_toggle = "collapse", data_target = "#employee-select-container" }) @@ -276,7 +489,7 @@
- + @* Nur für ausgewählten Kostenträger *@
@Html.CheckBoxFor(m => m.IsForSelectedCostbearersOnly, new { id = "selected-organisation-cb", @class = "custom-control-input", onchange = "setIsOnlyForSelectedOrganisation()", data_toggle = "collapse", data_target = "#organisation-select-container" }) @@ -288,7 +501,7 @@
- + @* Nur für ausgewählte Leistungskategorie *@
@Html.CheckBoxFor(m => m.IsForSelectedCategoryOnly, new { id = "selected-category-cb", @class = "custom-control-input", onchange = "setIsOnlyForSelectedServiceCategory()", data_toggle = "collapse", data_target = "#test-div3" }) @@ -353,9 +566,10 @@
- + + @* Info-, Erstellen- und Vorschau-Buttons *@
- @@ -377,13 +591,13 @@
-
+
-
+
@@ -423,7 +637,7 @@
-
Legende
+
Legende
@@ -508,7 +722,7 @@
-

Quittierungsbeleg

+

Quittierungsbeleg

diff --git a/BeWoPlanerMobil/Views/ReportViewer/BerichteFormPartialView.cshtml b/BeWoPlanerMobil/Views/ReportViewer/BerichteFormPartialView.cshtml index 910f293a2..ccc4c0513 100644 --- a/BeWoPlanerMobil/Views/ReportViewer/BerichteFormPartialView.cshtml +++ b/BeWoPlanerMobil/Views/ReportViewer/BerichteFormPartialView.cshtml @@ -15,29 +15,6 @@ } } -@* - Formular-Inputs: - - 1. SupportConcept wie in SingleBookingFormPartial.cshtml - 2. Employee - 3. Customer - 4. Team - 5. Organisation - 6. Month - 7. Year (DateTime.Now.Year - 10 bis DateTime.Now.Year + 1) - 8. Date - 9. DateRange (Start & Ende) - 10. ValueListEntry, z.B. Betreuungsart_8 -> Name: Betreuungsart, ValueListEntryType: 8 - 11. ServiceCategory - 12. Custom - 13. Text - - - - - // ToDo: Beim Auswählen eines Hilfeplans etc. berichte-form-container neu laden! -*@ - @if(Model.SelectedQuery != null && Model.SelectedQuery.Parameter != null && Model.SelectedQuery.Parameter.Count > 0) { -
+
@for(var i = 0; i < Model.SelectedQuery.Parameter.Count; i++) { var parameter = Model.SelectedQuery.Parameter[i]; + + if(parameter?.QueryParameterOid is null) + { + continue; + } + var parameterType = (int) parameter.ParamType; - var parameterOid = parameter.QueryParameterOid; + var parameterOid = parameter.QueryParameterOid.Value; switch(parameter.ParamType) { @@ -224,7 +264,7 @@
-
Hilfeplanauswahl
+
Hilfeplanauswahl
@@ -272,28 +312,39 @@ @{ var employeeButtonValue = "Mitarbeiter"; - if(parameterOid.HasValue && Model.SelectedValues.ContainsKey(parameterOid.Value) && Model.SelectedValues[parameterOid.Value].Parameter is CompactEmployeeDC selectedEmployee) + if(Model.SelectedValues.ContainsKey(parameterOid) && Model.SelectedValues[parameterOid].Parameter is CompactEmployeeDC selectedEmployee) { employeeButtonValue = selectedEmployee.DetailDescription; } } - - - @foreach(var month in Model.Months) { var selected = string.Empty; - if(parameterOid.HasValue && Model.SelectedValues.ContainsKey(parameterOid.Value)) + if(Model.SelectedValues.ContainsKey(parameterOid)) { - if(Model.SelectedValues[parameterOid.Value].Parameter is string monthAsString && Model.Months.Any(m => m.Value.Equals(monthAsString))) + if(Model.SelectedValues[parameterOid].Parameter is DateTime monthDate && month.Value.Equals(monthDate.Month.ToString())) + { + selected = "selected"; + } + } + else + { + var lastMonth = DateTime.Today.AddMonths(-1); + var selectedMonth = lastMonth.Month.ToString(); + + if(selectedMonth.Equals(month.Text)) { selected = "selected"; } @@ -365,20 +436,27 @@ } - @foreach(var year in MobileUtils.Years) { var selected = string.Empty; - if(parameterOid.HasValue && Model.SelectedValues.ContainsKey(parameterOid.Value)) + if(Model.SelectedValues.ContainsKey(parameterOid) && Model.SelectedValues[parameterOid].Parameter is DateTime selectedYear) { - if(Model.SelectedValues[parameterOid.Value].Parameter is int selectedYear && year.Equals(selectedYear)) + if(year.Equals(selectedYear.Year)) { selected = "selected"; } } + else + { + var lastMonth = DateTime.Today.AddMonths(-1); + var selectedYear2 = lastMonth.Year; - + selected = year.Equals(selectedYear2) ? "selected" : string.Empty; + } + + }
@@ -388,6 +466,12 @@
break; case QueryParameterType.Date: + var dateValue = string.Empty; + if(Model.SelectedValues.ContainsKey(parameterOid) && Model.SelectedValues[parameterOid].Parameter is DateTime queryDate) + { + dateValue = queryDate.ToString("dd.MM.yyyy"); + } +
@@ -397,7 +481,7 @@ Datum
- +
@@ -409,6 +493,14 @@
break; case QueryParameterType.DateRange: + var startValue = string.Empty; + var endValue = string.Empty; + + if(Model.SelectedValues.ContainsKey(parameterOid) && Model.SelectedValues[parameterOid].Parameter is BS.Shared.Core.DateTimeSpan dateTimeSpan) + { + startValue = dateTimeSpan.StartDate.ToString("dd.MM.yyyy"); + endValue = dateTimeSpan.EndDate.ToString("dd.MM.yyyy"); + }
@@ -418,7 +510,7 @@ Zeitraum
- +
@@ -430,7 +522,7 @@
- +
@@ -448,28 +540,40 @@ @{ var teamButtonValue = "Team"; - if(parameterOid.HasValue && Model.SelectedValues[parameterOid.Value].Parameter is CompactTeamDC selectedTeam) + if(Model.SelectedValues.ContainsKey(parameterOid) && Model.SelectedValues[parameterOid].Parameter is CompactTeamDC selectedTeam) { teamButtonValue = selectedTeam.Name; } } - -
+ @{ + var selectedText = Model.SelectedValues.ContainsKey(parameterOid) ? Model.SelectedValues[parameterOid].Parameter.ToString() : string.Empty; + } +
@@ -532,14 +641,14 @@ Jahr
- @foreach(var year in MobileUtils.Years) { var selected = string.Empty; - if(parameterOid.HasValue && Model.SelectedValues.ContainsKey(parameterOid.Value)) + if(Model.SelectedValues.ContainsKey(parameterOid)) { - if(Model.SelectedValues[parameterOid.Value].Parameter is int selectedYear && year.Equals(selectedYear)) + if(Model.SelectedValues[parameterOid].Parameter is int selectedYear && year.Equals(selectedYear)) { selected = "selected"; } @@ -559,26 +668,44 @@
-
- @parameter.Name -
-
- @* + + + @foreach(var valueListEntry in Model.ValueListEntryTypes2ValueListEntries[Model.GetValueListEntryTypeByQueryParameter(parameter.Name)]) + { + var selected = string.Empty; + + if(selectedValueListEntry?.Equals(valueListEntry) ?? false) + { + selected = "selected"; + } + + } - *@ +
@@ -591,32 +718,44 @@ @{ var organisationButtonValue = "Organisation"; - if(parameterOid.HasValue && Model.SelectedValues.ContainsKey(parameterOid.Value)) + if(Model.SelectedValues.ContainsKey(parameterOid)) { - if(Model.SelectedValues[parameterOid.Value].Parameter is CompactOrganisationDC selectedOrganisation) + if(Model.SelectedValues[parameterOid].Parameter is CompactOrganisationDC selectedOrganisation) { organisationButtonValue = selectedOrganisation.DetailDescription; } } } - - @@ -627,7 +766,7 @@
-
+
@parameter.Name
@@ -644,6 +783,13 @@ break; } } + +
+
+
+ +
+
} diff --git a/BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml b/BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml index 0a8200014..715937355 100644 --- a/BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml +++ b/BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml @@ -52,7 +52,7 @@ } -
+
@@ -68,5 +68,8 @@
- @Html.Partial("BeWoReportPartial", Model) + @if(Model?.Report != null) + { + @Html.Partial("BeWoReportPartial", Model) + }
\ No newline at end of file diff --git a/BeWoPlanerMobil/Views/ReportViewer/ReportViewerFormPartial.cshtml b/BeWoPlanerMobil/Views/ReportViewer/ReportViewerFormPartial.cshtml index 619004775..29d776d7f 100644 --- a/BeWoPlanerMobil/Views/ReportViewer/ReportViewerFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/ReportViewer/ReportViewerFormPartial.cshtml @@ -16,7 +16,6 @@ + @@ -95,8 +96,6 @@ window.addEventListener("error", (event) => { hideSpinner(); - var textToShow = `Message: ${event.message}\r\nFile name: ${event.filename}\r\nLine: ${event.lineno}\r\nColumn: ${event.colno}\r\nStack: ${event.error.stack}`; - if(event.message === "Uncaught TypeError: this._contentReadyAction is not a function") { logInfo("contentReadyAction-Fehler ist aufgetregen. Kann ignoriert werden."); return; @@ -112,7 +111,7 @@ return; } - configureErrorPopup(textToShow); + configureErrorPopup(`Message: ${event.message}\r\nFile name: ${event.filename}\r\nLine: ${event.lineno}\r\nColumn: ${event.colno}\r\nStack: ${event.error.stack}`); }); function showChangePasswordPopup() { @@ -123,11 +122,11 @@ var initialPwPrependWidth = 0; function calcChPwPrepend() { try { - if (initialPwPrependWidth <= 0 && $.isNumeric(getMaxWidth("pw-prepend"))) { + if(initialPwPrependWidth <= 0 && $.isNumeric(getMaxWidth("pw-prepend"))) { initialPwPrependWidth = getMaxWidth("pw-prepend"); } - if (initialPwPrependWidth <= 0) { + if(initialPwPrependWidth <= 0) { return; } @@ -137,7 +136,6 @@ } } - function copyErrorToClipboard() { var element = document.querySelector("#fehlerdetail-textarea"); element.select(); @@ -149,9 +147,7 @@ function showErrorPopup(error, htmlMessage) { hideSpinner(); - var textToShow = "name: " + error.name + ";\r\nmessage: " + error.message + ";\r\nstack: " + error.stack; - - configureErrorPopup(textToShow, htmlMessage); + configureErrorPopup(`name: ${error.name};\r\nmessage: ${error.message};\r\nstack: ${error.stack}`, htmlMessage); } function showErrorMessagePopup(text, htmlMessage) { @@ -226,11 +222,22 @@ s = "0" + s; } - $("#countdown").html("Abmeldung in " + m + ":" + s + ''); + $("#countdown").html(`Abmeldung in ${m}:${s}`); }, 1000); } calcPrependWidth(); + + @{ + var errorAlertMessage = TempData[TempDataConstants.ErrorAlertPopupMessage]?.ToString(); + + if(!string.IsNullOrWhiteSpace(errorAlertMessage)) + { + + $("#error-alert-popup").modal("show"); + + } + } } catch (error) { showErrorPopup(error); } @@ -248,11 +255,11 @@ var val = widthToBootstrapVal(width); if(previousWidth !== val) { - console.log("%c" + val, "font-size: 16px; font-weight: bold; color: #00F2FF;"); + console.log(`%c${val}`, "font-size: 16px; font-weight: bold; color: #00F2FF;"); } - previousWidth = val; - $("#size-info-span").text(val); + window.previousWidth = val; + $("#dev-size-span").text(val); } function widthToBootstrapVal(width) { @@ -366,10 +373,14 @@
@Model.LoggedInEmplyeeFirstNameLastName + @if(Html.IsInDebugMode()) + { + + } - + - + @@ -524,7 +535,7 @@
-
Es ist ein Fehler aufgetreten
+
Es ist ein Fehler aufgetreten
@@ -549,7 +560,32 @@
- + + @if(TempData[TempDataConstants.ErrorMessageKey] != null) { @@ -569,7 +605,6 @@ -
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 9fe7beaff..e923f2055 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -51,7 +51,7 @@ namespace BeWo.Service.Plugins //t = "4950382346"; // Holsinger //t = "5973016645"; // Verein Lebensgestaltung Hanau //t = "7375324044"; // Diakonie KK Kleve - t = "1441747891"; // BeWo Mobil Köln + //t = "1441747891"; // BeWo Mobil Köln //t = "5120047701"; // Trialog //t = "3629696651"; // Soziale Dienste Niederrhein (SDN) //t = "9893557471"; // Caritas Frankfurt @@ -341,7 +341,7 @@ namespace BeWo.Service.Plugins //t = "2986016022"; // Ev Verein für Wohnraumhilfe Frankfurt a.M. //t = "2181497347"; // BetreuungsserviceFuerAlltagUndWohnen (BAW Aachen) //t = "5433105975"; // aha e.V. - //t = "7396826106"; // SKF Sozialdienst katholischer Frauen e.V. Leverkusen + t = "7396826106"; // SKF Sozialdienst katholischer Frauen e.V. Leverkusen //t = "4748304562"; // BeWo Darmstadt //t = "5315865694"; // Wismarer Werkstätten GmbH //t = "6971328056"; // SKM Krefeld @@ -390,6 +390,7 @@ namespace BeWo.Service.Plugins //t = "8735029937"; // Caritas Ostvest //t = "7653029063"; // SkF Leverkusen JuHi //t = "5000000000"; + //t = "5564670353"; // Mittelpunkt GbR return t; #else