diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 514490af7..3c448d482 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -79,6 +79,9 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + + ..\packages\Bogus.35.6.3\lib\net40\Bogus.dll + False @@ -658,6 +661,9 @@ + + + diff --git a/BeWoPlanerMobil/Controllers/AbstractBaseController.cs b/BeWoPlanerMobil/Controllers/AbstractBaseController.cs index c00149d73..cd7d4acba 100644 --- a/BeWoPlanerMobil/Controllers/AbstractBaseController.cs +++ b/BeWoPlanerMobil/Controllers/AbstractBaseController.cs @@ -58,20 +58,7 @@ namespace BeWoPlanerMobil.Controllers } } - public static int TimeoutLimit - { - get - { - var timeUntilUILock = BS.Shared.Settings.ApplicationSettings.TimeUntilUILock; - - if(timeUntilUILock > 0 && System.Web.HttpContext.Current.Session.Timeout > timeUntilUILock) - { - return timeUntilUILock; - } - - return System.Web.HttpContext.Current.Session.Timeout; - } - } + public static int TimeoutLimit => System.Web.HttpContext.Current.Session.Timeout; [Authorize] public ActionResult UpdateApplicationSettings(string pKey, string pValue) diff --git a/BeWoPlanerMobil/Controllers/CustomerController.cs b/BeWoPlanerMobil/Controllers/CustomerController.cs index fdbb4e658..861149a7c 100644 --- a/BeWoPlanerMobil/Controllers/CustomerController.cs +++ b/BeWoPlanerMobil/Controllers/CustomerController.cs @@ -638,6 +638,7 @@ namespace BeWoPlanerMobil.Controllers if(medList?.MedikamentenverordnungslistenOid is null || Request?.Url is null) { + TempData[TempDataConstants.ReportMessageKey] = $"Es konnte keine {Model.SelectedReportType} für {Model.SelectedCustomer.LastName}, {Model.SelectedCustomer.FirstName} gefunden werden."; return; } diff --git a/BeWoPlanerMobil/Controllers/DebuggingToolsController.cs b/BeWoPlanerMobil/Controllers/DebuggingToolsController.cs index 1a129abda..389a0b59f 100644 --- a/BeWoPlanerMobil/Controllers/DebuggingToolsController.cs +++ b/BeWoPlanerMobil/Controllers/DebuggingToolsController.cs @@ -1,7 +1,10 @@ -using System.Web.Mvc; +using System.Collections.Generic; +using System.Linq; +using System.Web.Mvc; using BeWoPlanerMobil.Models; using BeWoPlanerMobil.Service; using BeWoPlanerMobil.Util; +using BS.Shared.Core; namespace BeWoPlanerMobil.Controllers { @@ -35,14 +38,34 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult DebuggingTools() { - if(!MobileSessionFacade.IsUserLoggedIn() || Model == null) + if(!MobileSessionFacade.IsUserLoggedIn() || Model is null) { return RedirectToActionPermanent("Index", "Login"); } + Model.MandatorSettings = new MandatorSettings(MobileSessionFacade.Mandator.Settings); + return View(Model); } + [Authorize] + public ActionResult LoadSettingsPartial() + { + return PartialView("DevToolsSettingsPartial", Model); + } + + [Authorize] + public ActionResult LoadUserRightPartial() + { + return PartialView("DevToolsUserRightsPartial", Model); + } + + [Authorize] + public ActionResult LoadDataGenerationPartial() + { + return PartialView("DevToolsDataGenerationPartial", Model); + } + [Authorize] public override string SaveCollapsibleStatus(bool isOpen, string identifier) { diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 87b7f9a59..65765675c 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -22,7 +22,6 @@ using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.Services; -using DevExpress.Mvvm.ModuleInjection.Native; using DevExpress.XtraScheduler; using DevExpress.XtraScheduler.Compatibility; using Newtonsoft.Json; diff --git a/BeWoPlanerMobil/Models/DebuggingToolsModel.cs b/BeWoPlanerMobil/Models/DebuggingToolsModel.cs index a1505dcd7..32ef0e2bf 100644 --- a/BeWoPlanerMobil/Models/DebuggingToolsModel.cs +++ b/BeWoPlanerMobil/Models/DebuggingToolsModel.cs @@ -1,11 +1,111 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using System.Collections.Generic; +using BS.Shared; +using BS.Shared.DataContracts; +using BS.Shared.Extensions; namespace BeWoPlanerMobil.Models { public class DebuggingToolsModel : AbstractModel { + // Rechtegruppen + // Benutzer + // Rechte und deren Übersetzungen + // Mandatorsettings + // Klienten, Mitarbeiter, Hilfepläne + Bewilligungen mit Zielen und gegebenenfalls individuelle Ziele erzeugen + + public List UserGroups { get; set; } = new List(); + public List UserRightTypes { get; set; } = new List(); + public List Users { get; set; } = new List(); + + public MandatorSettings MandatorSettings { get; set; } + } + + public class MandatorSettings + { + public MandatorSettings(string settingsString) + { + var bananaSplit = settingsString.Split(';'); + + foreach(var setting2Value in bananaSplit) + { + var split2 = setting2Value.Split('='); + + this[split2[0]] = split2[1]; + } + } + + public object this[string propertyName] + { + get => typeof(MandatorSettings).GetPropertyValue(propertyName); + set + { + var property = typeof(MandatorSettings).GetProperty(propertyName); + + if(property is null) + { + return; + } + + typeof(MandatorSettings).SetPropertyValue(propertyName, value); + } + } + + public Dictionary PossibleServiceRecordUnits { get; set; } = new Dictionary + { + {"0", "Minuten"}, + {"1", "Stunden"}, + {"2", "Stunden und Minuten"} + }; + + public bool HideServiceRecordInsertedByAndInsertedOn { get; set; } + public bool IsEndDateVisible { get; set; } + public bool IsServiceRecordNoticeMandatory { get; set; } + public bool IsZeiterfassDateNormal { get; set; } + + public bool SetStartTimeToEndTimeAfterSave { get; set; } + public bool ShowAdditionalService { get; set; } + public bool ShowAnnualReport { get; set; } + public bool ShowArbeitszeiten { get; set; } + public bool ShowBetrag { get; set; } + public bool ShowChat { get; set; } + public bool ShowCustomerDistanceFields { get; set; } + public bool ShowDatevFields { get; set; } + public bool ShowDienstplanung { get; set; } + public bool ShowDistanceFields { get; set; } + public bool ShowEmployeeSignature { get; set; } + public bool ShowHilfeplanBezeichnung { get; set; } + public bool ShowHilfeplanStatistikReport { get; set; } + public bool ShowInfoButtonInCalender { get; set; } + public bool ShowKlientenBetreuungszeiten { get; set; } + public bool ShowMarker { get; set; } + public bool ShowMedication { get; set; } + public bool ShowMultipleResourceColors { get; set; } + public bool ShowOnlyMySupportConcepts { get; set; } + public bool ShowOwnChatSettings { get; set; } + public bool ShowPivotGrid { get; set; } + public bool ShowRoundedDurationInEmployeeAnalysis { get; set; } + public bool ShowRtfTextfield { get; set; } + public bool ShowScheduler { get; set; } + public bool ShowServicesOverviewHalfOrWholeMonth { get; set; } + public bool ShowSignature { get; set; } + public bool ShowTeamNews { get; set; } + public bool ShowUrlaubsplanung { get; set; } + public bool ShowWohnheime { get; set; } + public bool AllowStorno { get; set; } + public bool DontShowSpitzabrechnung { get; set; } + public bool IsOnlyYearMonthVisible { get; set; } + public bool IsPasswordSecurityActiv { get; set; } + public bool PrinterSettingsUseLandscape { get; set; } + public bool PrinterSettingsUseMargins { get; set; } + public bool PrinterSettingsUsePaperKind { get; set; } + public bool ShowResources { get; set; } + + public int MaxDaysEditServiceRecordsAllowed { get; set; } + public int ZeiterfassungsSchwellwert { get; set; } + public int AnzTageZeiterfassErfolgt { get; set; } + public int DienstplanungStandardZeilenAnzahl { get; set; } + public int HilfeplanAuslaufAuswahl { get; set; } + public int TimeUntilUILock { get; set; } + public int EinheitZeiterfassung { get; set; } } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Util/FormCollectionConstants.cs b/BeWoPlanerMobil/Util/FormCollectionConstants.cs index 75a22d8fe..9d4742f0b 100644 --- a/BeWoPlanerMobil/Util/FormCollectionConstants.cs +++ b/BeWoPlanerMobil/Util/FormCollectionConstants.cs @@ -84,5 +84,6 @@ public static string ReportErrorMessageKey => "ReportErrorMessage"; public static string ErrorAlertPopupMessage => "ErrorAlertPopupMessage"; public static string InfoMessageKey => "InfoMessage"; + public static string ReportMessageKey => "ReportMessage"; } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Util/HtmlHelperExtensions.cs b/BeWoPlanerMobil/Util/HtmlHelperExtensions.cs index 0f910fd4c..1ab65457d 100644 --- a/BeWoPlanerMobil/Util/HtmlHelperExtensions.cs +++ b/BeWoPlanerMobil/Util/HtmlHelperExtensions.cs @@ -307,5 +307,134 @@ namespace BeWoPlanerMobil.Util return isShown ? "fa-chevron-up" : "fa-chevron-down"; } + + public static IHtmlString BootstrapCheckbox(this HtmlHelper htmlHelper, string id, string labelText, bool isChecked = false, string title = null, string onChangeEvent = null) + { + var containerDiv = new TagBuilder("div"); + containerDiv.AddCssClass("custom-checkbox"); + containerDiv.AddCssClass("custom-control"); + + var input = new TagBuilder("input"); + input.AddCssClass("custom-control-input"); + input.MergeAttribute("type", "checkbox"); + input.MergeAttribute("id", id); + + if(isChecked) + { + input.MergeAttribute("checked", "true"); + } + + if(false == string.IsNullOrWhiteSpace(onChangeEvent)) + { + input.MergeAttribute("onchange", onChangeEvent); + } + + var label = new TagBuilder("label"); + label.AddCssClass("custom-control-label"); + label.MergeAttribute("for", id); + label.InnerHtml = labelText; + + if(false == string.IsNullOrWhiteSpace(title)) + { + containerDiv.MergeAttribute("title", title); + } + + containerDiv.AppendInnerHtml(input); + containerDiv.AppendInnerHtml(label); + + return MvcHtmlString.Create(containerDiv.ToString()); + } + + public static IHtmlString BootstrapNumberInput(this HtmlHelper htmlHelper, string id, string labelText, int value, string min, string max, string step, string additionalContainerCssClasses = null, string title = null, string onChangeEvent = null, BootstrapInputGroupSize size = BootstrapInputGroupSize.Default) + { + var containerDiv = new TagBuilder("div"); + containerDiv.AddCssClass("input-group"); + + if(false == string.IsNullOrWhiteSpace(additionalContainerCssClasses)) + { + containerDiv.AddCssClass(additionalContainerCssClasses); + } + + if(false == string.IsNullOrWhiteSpace(title)) + { + containerDiv.MergeAttribute("title", title); + } + + var prepend = new TagBuilder("div"); + prepend.AddCssClass("input-group-prepend"); + + var inputGroupText = new TagBuilder("div"); + inputGroupText.AddCssClass("input-group-text"); + inputGroupText.InnerHtml = labelText; + + var input = new TagBuilder("input"); + input.AddCssClass("form-control"); + input.MergeAttribute("type", "number"); + input.MergeAttribute("min", min); + input.MergeAttribute("step", step); + input.MergeAttribute("id", id); + input.MergeAttribute("value", value.ToString()); + + if(false == string.IsNullOrWhiteSpace(onChangeEvent)) + { + input.MergeAttribute("onchange", onChangeEvent); + } + + prepend.AppendInnerHtml(inputGroupText); + + containerDiv.AppendInnerHtml(prepend); + containerDiv.AppendInnerHtml(input); + + return MvcHtmlString.Create(containerDiv.ToString()); + } + + public static IHtmlString BootstrapSelect(this HtmlHelper htmlHelper, string id, string labelText, string selectedValue, Dictionary value2Text, string onChangeEvent = null) + { + var containerDiv = new TagBuilder("div"); + containerDiv.AddCssClass("input-group"); + + var label = new TagBuilder("label"); + label.AddCssClass("input-group-text"); + label.MergeAttribute("for", id); + label.InnerHtml = labelText; + + var prepend = new TagBuilder("div"); + prepend.AddCssClass("input-group-prepend"); + prepend.AppendInnerHtml(label); + + var select = new TagBuilder("select"); + select.AddCssClass("custom-select"); + + foreach(var val2Text in value2Text) + { + var option = new TagBuilder("option"); + option.MergeAttribute("value", val2Text.Key); + option.InnerHtml = val2Text.Value; + + if(val2Text.Key.Equals(selectedValue)) + { + option.MergeAttribute("selected", "selected"); + } + + select.AppendInnerHtml(option); + } + + if(false == string.IsNullOrWhiteSpace(onChangeEvent)) + { + select.MergeAttribute("onchange", onChangeEvent); + } + + containerDiv.AppendInnerHtml(prepend); + containerDiv.AppendInnerHtml(select); + + return MvcHtmlString.Create(containerDiv.ToString()); + } + } + + public enum BootstrapInputGroupSize + { + Small, + Default, + Large } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Customer/Customer.cshtml b/BeWoPlanerMobil/Views/Customer/Customer.cshtml index 69d9b24fd..a88fefbda 100644 --- a/BeWoPlanerMobil/Views/Customer/Customer.cshtml +++ b/BeWoPlanerMobil/Views/Customer/Customer.cshtml @@ -835,7 +835,7 @@ @* ----- Medikamentenliste ----- *@ - if(AbstractModel.IsAllowedToSeeMedikamentenliste) + if(AbstractModel.IsAllowedToSeeMedikamentenliste && Model.SelectedCustomer.Medikamentenverordnungslisten.Any()) {
diff --git a/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml index 9ca387b93..1b0da330c 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml @@ -63,7 +63,7 @@ const selectedOption = $("#absence-reason-select option:selected"); - if(!isInfinite && end.getTime() > start.getTime()) { + if(!isInfinite && end.getTime() < start.getTime()) { validationMessage = "Das Enddatum muss vor dem Startdatum liegen."; } diff --git a/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml index 22e524b70..6079567ea 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml @@ -380,7 +380,6 @@ -
@foreach(var bargeldkasse in Model.Bargeldkassen) { @@ -525,7 +524,7 @@ @if(bargeldkasse.Bargeldtransaktionen.Any()) {
-
+
@@ -550,8 +549,8 @@ var betrag = transaktion.Betrag.Value.ToString("0.00 €"); var zahlungsart = transaktion.Zahlungstyp.ToString(); - - + +
@if(transaktion.SignatureOid is null) { diff --git a/BeWoPlanerMobil/Views/Customer/CustomerMedListPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerMedListPartial.cshtml index 85ed6621e..7d50efd52 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerMedListPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerMedListPartial.cshtml @@ -8,7 +8,7 @@ const historyList = $("#med-list-history-list"); $("#show-med-list-btn").prop("disabled", selectedReportType === "2"); - if (selectedReportType !== "2") { + if(selectedReportType !== "2") { historyList.hide(); return; } @@ -92,7 +92,7 @@
- @if(!(Model.SelectedCustomer is null)) + @if(Model.SelectedCustomer != null) { var displayValue = Model.SelectedReportType == CustomerReportType.Historie ? string.Empty : "d-none"; diff --git a/BeWoPlanerMobil/Views/DebuggingTools/DebuggingTools.cshtml b/BeWoPlanerMobil/Views/DebuggingTools/DebuggingTools.cshtml index 8449e506a..a5a62df22 100644 --- a/BeWoPlanerMobil/Views/DebuggingTools/DebuggingTools.cshtml +++ b/BeWoPlanerMobil/Views/DebuggingTools/DebuggingTools.cshtml @@ -21,9 +21,54 @@ $(".collapse").on("hidden.bs.collapse", function() { window.saveCollapsibleState($(this).attr("id"), "@Url.Action("SaveCollapsibleStatus")"); }); + + $(".nav-link").removeClass("active"); + $("#settings-tab").addClass("active"); + + $(`#dev-tools-tab-container`).load("@Url.Action("LoadSettingsPartial")"); }); + + function selectTab(element) { + var url = ""; + + switch($(element).prop("id")) { + case "user-rights-tab": + url = "@Url.Action("LoadUserRightPartial")"; + break; + case "generate-data-tab": + url = "@Url.Action("LoadDataGenerationPartial")"; + break; + default: + url = "@Url.Action("LoadSettingsPartial")"; + break; + } + + $(".nav-link").removeClass("active"); + $(element).addClass("active"); + + $(`#dev-tools-tab-container`).load(url); + } -
- Hier kommen nützliche Tools hin ... +
+
+
+ +
+
+
+ +
+
+
\ No newline at end of file diff --git a/BeWoPlanerMobil/Views/DebuggingTools/DevToolsDataGenerationPartial.cshtml b/BeWoPlanerMobil/Views/DebuggingTools/DevToolsDataGenerationPartial.cshtml new file mode 100644 index 000000000..13310ccff --- /dev/null +++ b/BeWoPlanerMobil/Views/DebuggingTools/DevToolsDataGenerationPartial.cshtml @@ -0,0 +1,8 @@ +@using BeWoPlanerMobil.Models +@using BeWoPlanerMobil.Util +@using BS.Shared +@model DebuggingToolsModel + +

+ Hier kann man bald Daten zum Testen generieren ... +

\ No newline at end of file diff --git a/BeWoPlanerMobil/Views/DebuggingTools/DevToolsSettingsPartial.cshtml b/BeWoPlanerMobil/Views/DebuggingTools/DevToolsSettingsPartial.cshtml new file mode 100644 index 000000000..fb4017912 --- /dev/null +++ b/BeWoPlanerMobil/Views/DebuggingTools/DevToolsSettingsPartial.cshtml @@ -0,0 +1,128 @@ +@using BeWoPlanerMobil.Models +@using BeWoPlanerMobil.Util +@model DebuggingToolsModel + + + +
+
+
+
+
Zeiterfassung
+
+
+ @Html.BootstrapCheckbox("HideServiceRecordInsertedByAndInsertedOn-cb", "'Angelegt von' und 'angelegt am' ausblenden", Model.MandatorSettings.HideServiceRecordInsertedByAndInsertedOn, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowBetrag-cb", "Betrag", Model.MandatorSettings.ShowBetrag, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowRtfTextfield-cb", "Dokufelder im FaC als RTF-Felder", Model.MandatorSettings.ShowRtfTextfield, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("IsServiceRecordNoticeMandatory-cb", "Dokumentationstext ist Pflicht", Model.MandatorSettings.IsServiceRecordNoticeMandatory, null, "onBoolSettingChange(this)") + @Html.BootstrapSelect("EinheitZeiterfassung-sc", "Einheit der Dauer", Model.MandatorSettings.EinheitZeiterfassung.ToString(), Model.MandatorSettings.PossibleServiceRecordUnits) + @Html.BootstrapCheckbox("IsEndDateVisible-cb", "Enddatum anzeigen", Model.MandatorSettings.IsEndDateVisible, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowDistanceFields-cb", "Gefahrene Kilometer", Model.MandatorSettings.ShowDistanceFields, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowMarker-cb", "Marker", Model.MandatorSettings.ShowMarker, null, "onBoolSettingChange(this)") + @Html.BootstrapNumberInput("ZeiterfassungsSchwellwert-nr", "Schwellwert der Zeiterfassung", Model.MandatorSettings.ZeiterfassungsSchwellwert, "0", null, "1", null, null, "onNumericSettingChange(this)", BootstrapInputGroupSize.Small) + @Html.BootstrapCheckbox("SetStartTimeToEndTimeAfterSave", "Startuhrzeit auf vorherige Enduhrzeit setzen", Model.MandatorSettings.SetStartTimeToEndTimeAfterSave, null, "onBoolSettingChange(this)") + @Html.BootstrapNumberInput("MaxDaysEditServiceRecordsAllowed-nr", "Tag des Folgemonats, bis zu dem Einträge bearbeitet werden kann", Model.MandatorSettings.MaxDaysEditServiceRecordsAllowed, "0", null, "1", null, "Tag des Folgemonats, bis zu dem die Zeiterfassung erfolgt sein muss", "onNumericSettingChange(this)", BootstrapInputGroupSize.Small) + @Html.BootstrapCheckbox("ShowSignature-cb", "Unterschriften", Model.MandatorSettings.ShowSignature, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("IsZeiterfassDateNormal-cb", "Zeiterfassung mit Jahresangabe", Model.MandatorSettings.IsZeiterfassDateNormal, null, "onBoolSettingChange(this)") +
+
+
+
+
+
+
Allgemein
+
+
+ @Html.BootstrapCheckbox("IsPasswordSecurityActive-cb", "Passwortsicherheit", Model.MandatorSettings.IsPasswordSecurityActiv, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("AllowStorno-cb", "Storno", Model.MandatorSettings.AllowStorno, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowOwnChatSettings-cb", "ownChat-Einstellungen anzeigen", Model.MandatorSettings.ShowOwnChatSettings, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowChat-cb", "ownChat im FaC anzeigen", Model.MandatorSettings.ShowChat, null, "onBoolSettingChange(this)") + @Html.BootstrapNumberInput("TimeUntilUILock-nr", "Zeit bis zur FaC-Inaktivitätssperre", Model.MandatorSettings.TimeUntilUILock, "0", null, "1", null, null, "onNumericSettingChange(this)", BootstrapInputGroupSize.Small) + +
+
+
+
+
Sonstiges
+
+
+ @Html.BootstrapCheckbox("ShowArbeitszeiten-cb", "Arbeitszeiten", Model.MandatorSettings.ShowArbeitszeiten, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowDatevFields-cb", "Datev-Felder", Model.MandatorSettings.ShowDatevFields, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowRoundedDurationInEmployeeAnalysis-cb", "Mitarbeiterauswertung gerundet", Model.MandatorSettings.ShowRoundedDurationInEmployeeAnalysis, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowEmployeeSignature-cb", "Mitarbeiterunterschrift", Model.MandatorSettings.ShowEmployeeSignature, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("IsOnlyYearMonthVisible-cb", "Nur Jahr Monat", Model.MandatorSettings.IsOnlyYearMonthVisible, null, "onBoolSettingChange(this)") + @Html.BootstrapNumberInput("DienstplanungStandardZeilenAnzahl-nr", "Standardzeilenanzahl der Dienstplanung", Model.MandatorSettings.DienstplanungStandardZeilenAnzahl, "0", null, "1", "my-1", null, "onNumericSettingChange(this)", BootstrapInputGroupSize.Small) +
+
+
+
+
+
+
Hilfepläne
+
+
+ @Html.BootstrapCheckbox("ShowHilfeplanBezeichnung-cb", "Hilfeplanbezeichnung anzeigen", Model.MandatorSettings.ShowHilfeplanBezeichnung, null, "onBoolSettingChange(this)") + @Html.BootstrapNumberInput("HilfeplanAuslaufAuswahl-nr", "Nach wie vielen Monaten der Hifleplan als ablaufend gilt", Model.MandatorSettings.HilfeplanAuslaufAuswahl, "0", null, "1", null, "Hilfeplanauswertung -> Hilfepläne anzeigen, die in den nächsten X Monaten auslaufen", "onNumericSettingChange(this)", BootstrapInputGroupSize.Small) + @Html.BootstrapCheckbox("ShowOnlyMySupportConcepts-cb", "Nur meine Hilfepläne", Model.MandatorSettings.ShowOnlyMySupportConcepts, null, "onBoolSettingChange(this)") +
+
+
+
+
Kalender
+
+
+ @Html.BootstrapCheckbox("ShowInfoButtonInCalender-cb", "Info-Knopf im Termin-Fenster", Model.MandatorSettings.ShowInfoButtonInCalender, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowMultipleResourceColors-cb", "Mehrere Ressourcenfarben", Model.MandatorSettings.ShowMultipleResourceColors, null, "onBoolSettingChange(this)") +
+
+
+
+
Klienten
+
+
+ @Html.BootstrapCheckbox("ShowKlientenBetreuungszeiten-cb", "Betreuungszeiten", Model.MandatorSettings.ShowKlientenBetreuungszeiten, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowCustomerDistanceFields-cb", "Entfernung zum Klienten", Model.MandatorSettings.ShowCustomerDistanceFields, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowMedication-cb", "Medikamentenverordnungen", Model.MandatorSettings.ShowMedication, null, "onBoolSettingChange(this)") +
+
+
+
+
+
+
Berichte
+
+
+ @Html.BootstrapCheckbox("ShowServicesOverviewHalfOrWholeMonth-cb", "Auswahl zwischen den Monatshälften oder anpassbarer Zeitraum", Model.MandatorSettings.ShowServicesOverviewHalfOrWholeMonth, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("PrinterSettingsUseLandscape-cb", "Drucker -> Seitenausrichtung quer", Model.MandatorSettings.PrinterSettingsUseLandscape, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("PrinterSettingsUseMargins-cb", "Drucker -> Margins benutzen", Model.MandatorSettings.PrinterSettingsUseMargins, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("PrinterSettingsUsePaperKind-cb", "Drucker -> Papierformat", Model.MandatorSettings.PrinterSettingsUsePaperKind, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowHilfeplanStatistikReport-cb", "Hilfeplanstatistikbericht", Model.MandatorSettings.ShowHilfeplanStatistikReport, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowAnnualReport-cb", "Jahresbericht", Model.MandatorSettings.ShowAnnualReport, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("DontShowSpitzabrechnung-cb", "Keine Spitzabrechnung", Model.MandatorSettings.DontShowSpitzabrechnung, null, "onBoolSettingChange(this)") +
+
+
+
+
Module
+
+
+ @Html.BootstrapCheckbox("ShowDienstplanung-cb", "Dienstplanung", Model.MandatorSettings.ShowDienstplanung, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowAdditionalService-cb", "Ergänzende Dienste", Model.MandatorSettings.ShowAdditionalService, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowScheduler-cb", "Kalender", Model.MandatorSettings.ShowScheduler, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowPivotGrid-cb", "Pivottabelle", Model.MandatorSettings.ShowPivotGrid, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowRessources-cb", "Ressourcen", Model.MandatorSettings.ShowResources, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowTeamNews-cb", "Team-News", Model.MandatorSettings.ShowTeamNews, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowUrlaubsplanung-cb", "Urlaubsplanung", Model.MandatorSettings.ShowUrlaubsplanung, null, "onBoolSettingChange(this)") + @Html.BootstrapCheckbox("ShowWohnheime-cb", "Wohnheime", Model.MandatorSettings.ShowWohnheime, null, "onBoolSettingChange(this)") +
+
+
+
\ No newline at end of file diff --git a/BeWoPlanerMobil/Views/DebuggingTools/DevToolsUserRightsPartial.cshtml b/BeWoPlanerMobil/Views/DebuggingTools/DevToolsUserRightsPartial.cshtml new file mode 100644 index 000000000..09be53c1f --- /dev/null +++ b/BeWoPlanerMobil/Views/DebuggingTools/DevToolsUserRightsPartial.cshtml @@ -0,0 +1,5 @@ +@using BeWoPlanerMobil.Models +@using BeWoPlanerMobil.Util +@using BS.Shared +@model DebuggingToolsModel + diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml index e0084e04b..c30b7498b 100644 --- a/BeWoPlanerMobil/Views/Main/Main.cshtml +++ b/BeWoPlanerMobil/Views/Main/Main.cshtml @@ -50,9 +50,9 @@ } function validatePasswordStrength() { - try { - (new MoKPasswordSecurity("pw-strength-feedback")).validatePassword($("#new-password").val()); - } catch (error) { + try{ + (new window.MoKPasswordSecurity("pw-strength-feedback")).validatePassword($("#new-password").val()); + } catch(error) { window.showErrorPopup(error); } } diff --git a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml index 4796eafd7..7e0d06b48 100644 --- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml @@ -530,6 +530,10 @@ { } + +
}
diff --git a/BeWoPlanerMobil/Views/Shared/BeWoReportPartial.cshtml b/BeWoPlanerMobil/Views/Shared/BeWoReportPartial.cshtml index 9a46ae27c..b6234f300 100644 --- a/BeWoPlanerMobil/Views/Shared/BeWoReportPartial.cshtml +++ b/BeWoPlanerMobil/Views/Shared/BeWoReportPartial.cshtml @@ -1,52 +1,86 @@ @using BeWoPlanerMobil.Util @model BeWoPlanerMobil.Models.AbstractModel - + $(document).on("shown.bs.modal", "#bewo-report-popup", function() { + if(bewoReportViewer === undefined || bewoReportViewer === null || $("#bewoReportViewer").length === false) { + return; + } - \ No newline at end of file + bewoReportViewer.AdjustControl(); + }); + + + +} +else if(TempData[TempDataConstants.ReportMessageKey] is string reportMessage) +{ + + + +} \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 896332385..c1f370cce 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -85,99 +85,98 @@ new StyleSheet { ExtensionSuite = ExtensionSuite.NavigationAndLayout, Theme = "Default" }, new StyleSheet { ExtensionSuite = ExtensionSuite.Report }, new StyleSheet { ExtensionType = ExtensionType.WebDocumentViewer } - ) + ) @Html.DevExpress().GetScripts( new Script { ExtensionSuite = ExtensionSuite.NavigationAndLayout }, new Script { ExtensionSuite = ExtensionSuite.Icons }, new Script { ExtensionType = ExtensionType.WebDocumentViewer } - ) + ) - + -