From 42ece55df3f6c0b384d982070940a33807b911df Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Mon, 14 Sep 2020 19:07:23 +0200 Subject: [PATCH] =?UTF-8?q?BeWoPlanerMobil:=20=20=20=20=20Zeiterfassungsei?= =?UTF-8?q?ntr=C3=A4ge=20auch=20ohne=20Uhrzeit=20m=C3=B6glich?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/BeWo.csproj | 26 --- BeWo/ServiceProxy/Generated.cs | 62 ++--- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 4 + BeWoPlanerMobil/Controllers/MainController.cs | 9 + .../Controllers/ReportController.cs | 85 +++++++ BeWoPlanerMobil/Models/AbstractModel.cs | 2 +- BeWoPlanerMobil/Models/ReportModel.cs | 66 ++++++ BeWoPlanerMobil/Scripts/view-scripts/main.js | 8 +- .../Scripts/view-scripts/report.js | 3 + BeWoPlanerMobil/Views/Report/Report.cshtml | 61 +++++ .../Views/Scheduler/Scheduler.cshtml | 220 +++++++++--------- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 4 +- Controls/Controls.csproj | 8 - Data/Access/SearchDAO.cs | 52 +++++ Data/Data.csproj | 3 + .../demo_reports/Export/QlikCsvExporter.cs | 2 +- Service/ServiceContracts/IEmployeeService.cs | 4 + .../EmployeeServiceImp.cs | 14 ++ 18 files changed, 435 insertions(+), 198 deletions(-) create mode 100644 BeWoPlanerMobil/Controllers/ReportController.cs create mode 100644 BeWoPlanerMobil/Models/ReportModel.cs create mode 100644 BeWoPlanerMobil/Scripts/view-scripts/report.js create mode 100644 BeWoPlanerMobil/Views/Report/Report.cshtml diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index c6351ac84..d4dba05d5 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -94,9 +94,6 @@ False ..\Lib\Blacklight.Wpf.Controls.dll - - ..\packages\CsvHelper.15.0.5\lib\net45\CsvHelper.dll - @@ -118,28 +115,18 @@ - - - - - - - - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -1232,7 +1219,6 @@ ReportView.xaml - @@ -2276,18 +2262,6 @@ {D5E53B0F-BF5A-41E8-93E2-0F32845FC729} Controls - - {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} - Data - - - {40D8B312-EA64-49E3-A31A-5E57ED4D5654} - Report - - - {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} - Service - {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} Shared diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 4cb2e73ca..b4c79c239 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -286,6 +286,11 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllActiveEmployeesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllActiveEmployees(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetActiveCompactCustomersForEmployee", ReplyAction="http://tempuri.org/IEmployeeService/GetActiveCompactCustomersForEmployeeResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetActiveCompactCustomersForEmployeeBeWoFault" + + "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetActiveCompactCustomersForEmployee(System.Nullable employeeOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/ArchiveEmployee", ReplyAction="http://tempuri.org/IEmployeeService/ArchiveEmployeeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/ArchiveEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void ArchiveEmployee(long pOid, long pVersion); @@ -732,6 +737,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetAllActiveEmployees(); } + public System.Collections.Generic.List GetActiveCompactCustomersForEmployee(System.Nullable employeeOid) + { + return base.Channel.GetActiveCompactCustomersForEmployee(employeeOid); + } + public void ArchiveEmployee(long pOid, long pVersion) { base.Channel.ArchiveEmployee(pOid, pVersion); @@ -1417,28 +1427,12 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GoalRatingDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.RatingTypeDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceDescriptionDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceAccountingDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationPersonRelationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AppointmentDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AppointmentCategoryDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimbuchungDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Wohnheimbuchung2Costbearer2SupportConceptRelationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimbuchungEmployeeRelationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerPersonRelationDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerOrganisationRelationDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.MedRecordDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DarreichungsformDC))] @@ -1490,34 +1484,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimCustomerRelationDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimEmployeeRelationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactWohnheimDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Merkzeichen))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Pflegegrad))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SettingsType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UserRightType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FileAttachmentType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TableID))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Priority))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Status))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UserValidationResult))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportPinDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 1ecba736f..7916e6001 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -174,9 +174,11 @@ + + @@ -383,6 +385,7 @@ + @@ -410,6 +413,7 @@ + diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 0a9c9a72f..79bc9ab77 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using System.Text; using System.Web.Mvc; +using System.Web.UI.WebControls.WebParts; using System.Windows.Forms; using BeWo.Service.ServiceImplementations; @@ -2109,11 +2110,13 @@ namespace BeWoPlanerMobil.Controllers } // Menünavigation + [Authorize] public ActionResult RedirectToScheduler() { return RedirectToActionPermanent("Scheduler", "Scheduler"); } + [Authorize] public ActionResult RedirectToCustomer() { if(Model?.SelectedSupportConcept?.Customer?.Oid.HasValue ?? false) @@ -2131,6 +2134,12 @@ namespace BeWoPlanerMobil.Controllers return RedirectToActionPermanent("Customer", "Customer"); } + [Authorize] + public ActionResult RedirectToReportView() + { + return AbstractModel.IsAllowedToSeeBills ? RedirectToActionPermanent("Report", "Report") : RedirectToMain(); + } + public ActionResult RedirectToMain() { return RedirectToActionPermanent("Main", "Main"); diff --git a/BeWoPlanerMobil/Controllers/ReportController.cs b/BeWoPlanerMobil/Controllers/ReportController.cs new file mode 100644 index 000000000..ad7dcf42b --- /dev/null +++ b/BeWoPlanerMobil/Controllers/ReportController.cs @@ -0,0 +1,85 @@ +using System.Linq; +using System.Web.Mvc; +using BeWoPlanerMobil.Models; +using BeWoPlanerMobil.Service; + +namespace BeWoPlanerMobil.Controllers +{ + /* + * Quittierungsbeleg wie im Fat-Client implementieren + * Mit Unterschriftenfunktion für den Mitarbeiter. + * Liste mit allen ServiceRecords des Mitarbeiters für einen Klienten. + * + * Felder: Mitarbeiter(Ist der eingeloggte, denn nur der darf unterschreiben), Klient, Monat, Vom, Bis, Jahr + */ + + public class ReportController : AbstractBaseController + { + private const string ReportModelSessionKey = "ReportModel"; + + private ReportModel _Model; + + public ReportModel Model + { + get + { + if(!MobileSessionFacade.IsUserLoggedIn()) + { + RedirectToActionPermanent("Index", "Login"); + return null; + } + + if(((ReportModel) Session[ReportModelSessionKey])?.Employee == null) + { + _Model = new ReportModel {Employee = MobileSessionFacade.LoggedInEmployee}; + Session[ReportModelSessionKey] = _Model; + } + else + { + _Model = (ReportModel) Session[ReportModelSessionKey]; + } + + return _Model; + } + } + + [Authorize] + public ActionResult Report() + { + if(!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeScheduler) + { + return RedirectToActionPermanent("Index", "Login"); + } + + var customers = EmployeeService.GetActiveCompactCustomersForEmployee(null); + + Model.Customers = customers; + + return View(Model); + } + + [Authorize] + [HttpPost] + public ActionResult CreateServiceOverview(FormCollection formCollection) + { + var test1 = formCollection["CustomerSelect"]; + var test2 = formCollection["MonthSelect"]; + var test3 = formCollection["YearSelect"]; + + return RedirectToActionPermanent("Report"); + } + + [Authorize] + public string SetCustomer(long customerOid) + { + if(Model == null) + { + return _LeerzeichenFuerGetMethoden; + } + + Model.SelectedCustomer = Model.Customers.FirstOrDefault(customer => customer.CustomerOid == customerOid); + + return _LeerzeichenFuerGetMethoden; + } + } +} \ No newline at end of file diff --git a/BeWoPlanerMobil/Models/AbstractModel.cs b/BeWoPlanerMobil/Models/AbstractModel.cs index 2d89af1f5..8b19a7b88 100644 --- a/BeWoPlanerMobil/Models/AbstractModel.cs +++ b/BeWoPlanerMobil/Models/AbstractModel.cs @@ -34,6 +34,6 @@ namespace BeWoPlanerMobil.Models public static string TimeOfLastAction { get; set; } public static bool HasRightToInsertRessourceAppointments => MobileSessionFacade.CheckForUserRight(UserRightType.KalenderRessourcentermineAnlegen) || MobileSessionFacade.CheckForUserRight(UserRightType.CreateAll); - public static bool IsAllowedToSeeBills => MobileSessionFacade.CheckForUserRight(UserRightType.Analysis_ServiceOverview_View); + public static bool IsAllowedToSeeBills => false;//MobileSessionFacade.CheckForUserRight(UserRightType.Analysis_ServiceOverview_View); } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Models/ReportModel.cs b/BeWoPlanerMobil/Models/ReportModel.cs new file mode 100644 index 000000000..f9fc2d264 --- /dev/null +++ b/BeWoPlanerMobil/Models/ReportModel.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Web.Mvc; +using BS.Shared.DataContracts.Compact; + +namespace BeWoPlanerMobil.Models +{ + public class ReportModel : AbstractModel + { + [Display(Name = "Klient")] public long? SelectedCustomerOid => SelectedCustomer?.CustomerOid; + + public CompactCustomerDC SelectedCustomer { get; set; } + + public List Customers { get; set; } + + public IEnumerable CustomerListItems + { + get + { + var result = new List(); + + result.AddRange(Customers.Select(customer => new SelectListItem {Value = customer.CustomerOid.ToString(), Text = customer.ToString()})); + + return result; + } + } + + [Display(Name = "Monat")] + public int SelectedMonth { get; set; } + + [Display(Name = "Jahr")] + public int SelectedYear { get; set; } + + public List Months + { + get + { + var result = new List(); + + for(var i = 1; i < 13; i++) + { + result.Add(new SelectListItem {Value = i.ToString(), Text = i.ToString()}); + } + + return result; + } + } + + public List Years + { + get + { + var result = new List(); + + for(var i = DateTime.Today.Year + 1; i > DateTime.Today.Year - 11; i--) + { + result.Add(new SelectListItem {Value = i.ToString(), Text = i.ToString()}); + } + + return result; + } + } + } +} \ No newline at end of file diff --git a/BeWoPlanerMobil/Scripts/view-scripts/main.js b/BeWoPlanerMobil/Scripts/view-scripts/main.js index cf9842612..0739768da 100644 --- a/BeWoPlanerMobil/Scripts/view-scripts/main.js +++ b/BeWoPlanerMobil/Scripts/view-scripts/main.js @@ -503,8 +503,12 @@ function getStartAndEndDate() { var startDatePicker = $("#start-date-picker"); var endDatePicker = $("#end-date-picker"); - if ($("#start-time").val().length === 0 || $("#end-time").val().length === 0) { - return null; + // Bei leeren Start- und Endfeldern. Muss ein Dummydate zurückgeben, + // damit das Speichern ohne Angabe der Start- und Endzeit möglich ist. + if($("#start-time").val().length === 0 || $("#end-time").val().length === 0) { + var dummyDate = moment(new Date(0, 0, 1)); + + return [dummyDate, dummyDate]; } startTimePicker.datetimepicker("show"); diff --git a/BeWoPlanerMobil/Scripts/view-scripts/report.js b/BeWoPlanerMobil/Scripts/view-scripts/report.js new file mode 100644 index 000000000..e2d9d6e58 --- /dev/null +++ b/BeWoPlanerMobil/Scripts/view-scripts/report.js @@ -0,0 +1,3 @@ +function setSelectedCustomer() { + +} \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Report/Report.cshtml b/BeWoPlanerMobil/Views/Report/Report.cshtml new file mode 100644 index 000000000..75e12e6be --- /dev/null +++ b/BeWoPlanerMobil/Views/Report/Report.cshtml @@ -0,0 +1,61 @@ +@model BeWoPlanerMobil.Models.ReportModel + +@{ + ViewBag.Title = "Quittierungsbeleg"; +} + + + +
+
+
+ @using(Html.BeginForm("CreateServiceOverview", "Report", FormMethod.Post)) + { +
+
+
+
+ @Html.LabelFor(m => m.SelectedCustomerOid) + @Html.DropDownListFor(m => m.SelectedCustomerOid, Model.CustomerListItems, new { id = "customers-drop-down", @class = "form-control", name = "CustomerSelect" }) +
+
+
+
+ +
+
+
+
+ @Html.LabelFor(m => m.SelectedMonth) + @Html.DropDownListFor(m => m.SelectedMonth, Model.Months, new { @class = "form-control", name = "MonthSelect" }) +
+
+
+
+ @Html.LabelFor(m => m.SelectedYear) + @Html.DropDownListFor(m => m.SelectedYear, Model.Years, new { @class = "form-control", name = "YearSelect" }) +
+
+
+
+ +
+
+ +
+
+ +
+
+ } +
+
+
\ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml b/BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml index 06ab93c33..f358db27e 100644 --- a/BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml +++ b/BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml @@ -105,136 +105,136 @@
-
-
-
-
- @using(Html.BeginForm("InsertOrUpdateAppointment", "Scheduler", FormMethod.Post, new { id = "insert-appointment-form" })) - { -
-
-
-
- -
- -
-
-
-
-
-
-
-
- -
- -
-
-
-
-
-
-
-
-
-
- -
- -
-
-
-
-
-
-
-
- -
- -
-
-
-
-
-
-
- @if(AbstractModel.HasRightToInsertRessourceAppointments && Model.ResourceCategories2Resources.Any()) - { +
+
+
+
+ @using(Html.BeginForm("InsertOrUpdateAppointment", "Scheduler", FormMethod.Post, new { id = "insert-appointment-form" })) + { +
-
- +
+ +
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
-
-
- @foreach(var selectedResource in Model.SelectedResources) - { -
-
-
- - @selectedResource.Name -
-
- +
+ +
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ @if(AbstractModel.HasRightToInsertRessourceAppointments && Model.ResourceCategories2Resources.Any()) + { +
+
+
+ +
+
+
+
+
+
+
+ @foreach(var selectedResource in Model.SelectedResources) + { +
+
+
+ + @selectedResource.Name +
+
+ +
-
- } + } +
-
- } + } -
-
-
- - +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- } + } -
-
- -
-
- -
-
- +
+
+ +
+
+ +
+
+ +
-
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 5639e87b2..d5a4f5a1b 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -142,7 +142,7 @@ } } - @*@if(AbstractModel.IsAllowedToSeeBills) + @if(AbstractModel.IsAllowedToSeeBills) { using(Html.BeginForm("RedirectToReportView", "Main", FormMethod.Post)) { @@ -155,7 +155,7 @@ } - }*@ + }
  • @using(Html.BeginForm("Logout", "Main", FormMethod.Post)) diff --git a/Controls/Controls.csproj b/Controls/Controls.csproj index e1f88d3e2..3319dd7ed 100644 --- a/Controls/Controls.csproj +++ b/Controls/Controls.csproj @@ -75,12 +75,10 @@ false - - @@ -90,12 +88,6 @@ 3.5 - - 3.5 - - - 3.5 - diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs index 902d860a1..36bf692dd 100644 --- a/Data/Access/SearchDAO.cs +++ b/Data/Access/SearchDAO.cs @@ -3386,5 +3386,57 @@ namespace BeWo.Data.Access { return FindListOfCustomerServiceRecordsForKilometerauswertung(customerOids, span).Any(); } + + public List GetAllCustomersForEmployee(long? employeeOid) + { + ApplicationUser user; + + if(employeeOid.HasValue) + { + var employee = CreateCriteria().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult(); + user = FindUserForEmployee(employee); + } + else + { + if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null) + { + user = LoggedInUserOperationContextExt.Current.User; + } + else + { + user = SessionFacade.LoggedInUser; + } + } + + var rights = new List(); + + user.UserGroups.DoForEach(s => s.Rights.DoForEach(right => rights.AddIfNotIn(right.RightType))); + + var lCriteria = CreateCriteriaIsActive(); + + if(rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.CustomerView_View)) + { + return lCriteria.List().ToList(); + } + + var result = new List(); + + if(rights.Contains(UserRightType.Customer_ViewMyCustomers)) + { + result = user.Employee.Employee2CustomerList.Select(employee2Customer => employee2Customer.Customer).Distinct().ToList(); + } + + if(rights.Contains(UserRightType.Customer_ViewMyTeams)) + { + var teams = FindAllActiveTeamsOfEmployee(user.Employee.Oid.Value); + + teams.DoForEach(team => + { + team.MemberList.DoForEach(member => result.AddRangeIfElementsNotIn(member.Employee2CustomerList.Select(employee2Customer => employee2Customer.Customer))); + }); + } + + return result; + } } } diff --git a/Data/Data.csproj b/Data/Data.csproj index 394494010..e4d2e7e16 100644 --- a/Data/Data.csproj +++ b/Data/Data.csproj @@ -74,6 +74,9 @@ + + False + diff --git a/ReportImp/demo_reports/Export/QlikCsvExporter.cs b/ReportImp/demo_reports/Export/QlikCsvExporter.cs index ebf80ea75..13fecc855 100644 --- a/ReportImp/demo_reports/Export/QlikCsvExporter.cs +++ b/ReportImp/demo_reports/Export/QlikCsvExporter.cs @@ -334,7 +334,7 @@ namespace demo_reports.Export var stringWriter = new StringWriter(); - using(var csv = new CsvWriter(stringWriter, CultureInfo.InvariantCulture)) + using(var csv = new CsvWriter(stringWriter, CultureInfo.GetCultureInfo("de-DE"))) { csv.WriteRecords(dataList); } diff --git a/Service/ServiceContracts/IEmployeeService.cs b/Service/ServiceContracts/IEmployeeService.cs index 42010f1be..e9d3d695e 100644 --- a/Service/ServiceContracts/IEmployeeService.cs +++ b/Service/ServiceContracts/IEmployeeService.cs @@ -379,5 +379,9 @@ namespace BeWo.Service.ServiceContracts [FaultContract(typeof(BeWoFault))] [OperationContract] List GetAllActiveEmployees(); + + [FaultContract(typeof(BeWoFault))] + [OperationContract] + List GetActiveCompactCustomersForEmployee(long? employeeOid); } } \ No newline at end of file diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs index babda98be..62e86e513 100644 --- a/Service/ServiceImplementations/EmployeeServiceImp.cs +++ b/Service/ServiceImplementations/EmployeeServiceImp.cs @@ -1631,5 +1631,19 @@ namespace BeWo.Service.ServiceImplementations throw Utils.CreateBeWoFaultException(exception); } } + + public List GetActiveCompactCustomersForEmployee(long? employeeOid) + { + try + { + var customers = DAOFactory.SearchDAO.GetAllCustomersForEmployee(employeeOid); + + return MapperFactory.CompactCustomerDC_Customer.MapToNewDCs(customers); + } + catch(Exception exception) + { + throw Utils.CreateBeWoFaultException(exception); + } + } } } \ No newline at end of file