From 051585ba6fc78ca6ee5eaefb9cc1645406731da5 Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Mon, 13 Feb 2023 12:33:43 +0100 Subject: [PATCH] . --- BeWoPlanerMobil/Util/AppointmentListItem.cs | 4 ++++ .../AppointmentIntervalFinderResultPartial.cshtml | 10 ++++++++-- .../Views/Scheduler/OneDaySchedulerPartial.cshtml | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/BeWoPlanerMobil/Util/AppointmentListItem.cs b/BeWoPlanerMobil/Util/AppointmentListItem.cs index 90a03d4be..315a6d718 100644 --- a/BeWoPlanerMobil/Util/AppointmentListItem.cs +++ b/BeWoPlanerMobil/Util/AppointmentListItem.cs @@ -62,6 +62,8 @@ namespace BeWoPlanerMobil.Util public bool HasEmployeesCustomersOrResources => !string.IsNullOrWhiteSpace(EmployeeListInfo + CustomerListInfo + ResourceListInfo); public bool AllDay { get; } + public bool HasServiceRecord { get; } + public AppointmentListItem(SchedulerAppointmentDC schedulerAppointment) { Identifier = Guid.NewGuid(); @@ -81,6 +83,8 @@ namespace BeWoPlanerMobil.Util var customerColor = string.Empty; var resourceColor = string.Empty; + HasServiceRecord = schedulerAppointment.ServiceRecordList?.Any() ?? false; + if(string.IsNullOrWhiteSpace(employeeColor) && schedulerAppointment.EmployeeList.Count == 0 && !string.IsNullOrWhiteSpace(schedulerAppointment.Originator?.EmployeeColor)) { employeeColor = schedulerAppointment.Originator.EmployeeColor; diff --git a/BeWoPlanerMobil/Views/Scheduler/AppointmentIntervalFinderResultPartial.cshtml b/BeWoPlanerMobil/Views/Scheduler/AppointmentIntervalFinderResultPartial.cshtml index 5dfb226aa..76f49cd1a 100644 --- a/BeWoPlanerMobil/Views/Scheduler/AppointmentIntervalFinderResultPartial.cshtml +++ b/BeWoPlanerMobil/Views/Scheduler/AppointmentIntervalFinderResultPartial.cshtml @@ -50,7 +50,13 @@ } - - +} +else if(Model.IntervalStartDate.HasValue && Model.IntervalEndDate.HasValue) +{ +
+ +
} diff --git a/BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml b/BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml index 4519374e7..3606f5458 100644 --- a/BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml +++ b/BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml @@ -46,6 +46,11 @@ } + + @if(appointment.HasServiceRecord) + { + + } @@ -134,6 +139,11 @@ } + + @if(appointment.HasServiceRecord) + { + + }