diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index ee4e2dc55..ec5c09de1 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -408,6 +408,8 @@ + + @@ -5076,6 +5078,12 @@ + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/BeWoPlanerMobil/Controllers/CustomerController.cs b/BeWoPlanerMobil/Controllers/CustomerController.cs index 88ffb03ef..071a522ab 100644 --- a/BeWoPlanerMobil/Controllers/CustomerController.cs +++ b/BeWoPlanerMobil/Controllers/CustomerController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.Mvc; +using BeWo.Report.DefaultReports; using BeWo.View.Navigation.Filter; using BeWoPlanerMobil.Models; using BeWoPlanerMobil.Service; @@ -276,10 +277,13 @@ namespace BeWoPlanerMobil.Controllers using (var memoryStream = ReportService.CreateMedikamentenlistenReport(medList.MedikamentenverordnungslistenOid.Value, MobileSessionFacade.Tenant)) { - var report = new XtraReport(); - report.PrintingSystem.LoadDocument(memoryStream); + var medikamentenverordnungslistenReport = new MedikamentenverordnungslistenReport(); + medikamentenverordnungslistenReport.PrintingSystem.LoadDocument(memoryStream); - Model.Report = report; + var height = medikamentenverordnungslistenReport.PageHeight; + var width = medikamentenverordnungslistenReport.PageWidth; + + Model.Report = medikamentenverordnungslistenReport; } } diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 74a4bfb77..0f7d1bfb1 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -164,10 +164,10 @@ namespace BeWoPlanerMobil.Controllers AbstractModel.ShowServiceRecordInsertedOn = !UserSettingsUtils.GetSettingValueAsBool(mandatorSettings, SettingsKeys.HideServiceRecordInsertedByAndInsertedOn); - Model.ShowSignature = UserSettingsUtils.GetSettingValueAsBool(mandatorSettings, SettingsKeys.ShowSignature); + Model.ShowSignature = UserSettingsUtils.GetSettingValueAsBool(mandatorSettings, SettingsKeys.ShowSignature);// && AbstractModel.HasRightToProvideSingleSignature; #if DEBUG - Model.ShowSignature = true; + //Model.ShowSignature = true; #endif Model.GroupsOfPeople = EmployeeService.GetAllGroups(GetUser().Employee.EmployeeOid).OrderBy(gop => gop.Name).ToList(); diff --git a/BeWoPlanerMobil/Models/AbstractModel.cs b/BeWoPlanerMobil/Models/AbstractModel.cs index 9461febe1..f672d878f 100644 --- a/BeWoPlanerMobil/Models/AbstractModel.cs +++ b/BeWoPlanerMobil/Models/AbstractModel.cs @@ -187,5 +187,7 @@ namespace BeWoPlanerMobil.Models } public static bool HasRightToViewDiagnosen => CheckRight(UserRightType.Customer_ViewDiagnosis); + + public static bool HasRightToProvideSingleSignature => CheckRight(UserRightType.Signature_ProvideSingleSignature); } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Customer/Customer.cshtml b/BeWoPlanerMobil/Views/Customer/Customer.cshtml index f2ecbca93..59bb683c1 100644 --- a/BeWoPlanerMobil/Views/Customer/Customer.cshtml +++ b/BeWoPlanerMobil/Views/Customer/Customer.cshtml @@ -70,6 +70,7 @@ function submitReportTypeSelectionForm() { try { + showSpinner(); var selectedReportType = $("#report-type-select").find(":selected").val(); $("#report-type-input").val(selectedReportType); @@ -110,7 +111,7 @@ function deleteHistoryMedList(oid, name) { try { - showMessagePopupWithCallback("Löschen","Sind Sie sicher, dass Sie die " + name + " löschen wollen?", function() { + showMessagePopupWithCallback("Löschen", "Sind Sie sicher, dass Sie die " + name + " löschen wollen?", function () { showSpinner(); $("#med-list-oid-delete").val(oid); $("#delete-history-med-list").submit(); @@ -760,12 +761,6 @@ } - - @if(!(Model.Report is null)) - { - // ToDo: Ist viel zu hoch auf kleinen Bildschirmen! - @Html.Partial("CustomerReportPartial", Model) - } @@ -907,6 +902,29 @@ } +@if(!(Model?.Report is null) && Html.IsInDebugMode()) +{ + +} + @using(Html.BeginForm("SelectReport", "Customer", FormMethod.Post, new { id = "medverordnungs-form" })) { diff --git a/BeWoPlanerMobil/Views/Customer/CustomerReportPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerReportPartial.cshtml index 5697cf2ee..d483694be 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerReportPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerReportPartial.cshtml @@ -3,27 +3,125 @@ @if(Model?.Report != null && Html.IsInDebugMode()) { -
- @Html.DevExpress().WebDocumentViewer(settings => - { - settings.Name = "webDocumentViewer2"; - settings.Width = Unit.Percentage(100); - settings.MobileMode = true; - settings.SettingsMobile.ReaderMode = true; - settings.SettingsMobile.AnimationEnabled = false; - settings.ClientSideEvents.Init = "customerReportInitEvent"; - }).Bind(Model.Report).GetHtml() -
+ @Html.DevExpress().WebDocumentViewer(settings => + { + settings.Name = "webDocumentViewer2"; + settings.Width = Unit.Percentage(100); + settings.Height = Unit.Percentage(100); + settings.MobileMode = true; + settings.SettingsMobile.ReaderMode = true; + settings.SettingsMobile.AnimationEnabled = false; + settings.ClientSideEvents.Init = "customerReportInitEvent"; + }).Bind(Model.Report).GetHtml() } \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml index 115bcd0a1..52a5d7576 100644 --- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml @@ -858,7 +858,7 @@ Gefahrene Kilometer:
- @string.Format("{0:0.##}", serviceRecord.DistanceInMeterDecimal) + @($"{serviceRecord.DistanceInMeterDecimal:0.##}")
} @@ -894,7 +894,7 @@ Angelegt für:
- @serviceRecord.Employee.ToString() + @($"{serviceRecord.Employee.FirstName} {serviceRecord.Employee.LastName}")
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index a74fc6bed..ed6152a16 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -55,6 +55,8 @@ + + @@ -374,7 +376,6 @@ } } - @*ToDo: Wie im FaC machen!*@ @if(AbstractModel.HasRightToViewReports && AbstractModel.HasRightToViewMitarbeiterstundenkonto) { using(Html.BeginForm("RedirectToReportViewer", "Main", FormMethod.Post)) @@ -416,7 +417,7 @@ } - +