diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 7bbed1673..fcdf1f4e6 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -726,6 +726,8 @@ + + diff --git a/BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs b/BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs index 82ebdc74f..bf3a65098 100644 --- a/BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs +++ b/BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs @@ -89,6 +89,13 @@ namespace BeWoPlanerMobil.Controllers AppointmentModel.PossibleEmployees = EmployeeService.GetAllAuthorizedCompactEmployees(); AppointmentModel.PossibleCustomers = CustomerService.GetAllAuthorizedCompactCustomers(); AppointmentModel.PossibleResources = KalenderService.GetAllResources(); + + AppointmentModel.ResourceCategories2Resources = new Dictionary>(); + + foreach(var resource in AppointmentModel.PossibleResources) + { + AppointmentModel.ResourceCategories2Resources.AddOrUpdateValueInDictionary(resource.ResourceCategory, resource); + } } private void InitViewModel() @@ -349,13 +356,7 @@ namespace BeWoPlanerMobil.Controllers { appointment.CustomerList = AppointmentModel.SelectedCustomers; appointment.ResourceList = AppointmentModel.SelectedResources; - - appointment.EmployeeList = new List(); - - foreach(var selectedEmployee in AppointmentModel.SelectedEmployees ?? new List()) - { - appointment.EmployeeList.Add(new Employee2SchedulerAppointmentDC { Employee = selectedEmployee }); - } + appointment.EmployeeList = AppointmentModel.SelectedEmployee2SchedulerAppointments; appointment.Originator = Model.LoggedInUser.Employee; @@ -398,41 +399,41 @@ namespace BeWoPlanerMobil.Controllers ReloadAppointments(); } - [HttpPost] - public ActionResult CustomerMultiSelectPartial(string value) - { - var selectedCustomerOids = GridLookupExtension.GetSelectedValues("CustomerGridLookup") ?? Array.Empty(); + //[HttpPost] + //public ActionResult CustomerMultiSelectPartial(string value) + //{ + // var selectedCustomerOids = GridLookupExtension.GetSelectedValues("CustomerGridLookup") ?? Array.Empty(); - AppointmentModel.SelectedCustomerOids = selectedCustomerOids.Where(oid => oid.HasValue).Select(oid => oid.Value).ToList(); + // AppointmentModel.SelectedCustomerOids = selectedCustomerOids.Where(oid => oid.HasValue).Select(oid => oid.Value).ToList(); - return PartialView("CustomerMultiSelectPartial", AppointmentModel); - } + // return PartialView("CustomerMultiSelectPartial", AppointmentModel); + //} - [HttpPost] - public ActionResult ResourceGridLookupPartial(string value) - { - var selectedResourceOids = GridLookupExtension.GetSelectedValues("ResourceGridLookup") ?? Array.Empty(); + //[HttpPost] + //public ActionResult ResourceGridLookupPartial(string value) + //{ + // var selectedResourceOids = GridLookupExtension.GetSelectedValues("ResourceGridLookup") ?? Array.Empty(); - AppointmentModel.SelectedResourceOids = selectedResourceOids.Where(oid => oid.HasValue).Select(oid => oid.Value).ToList(); + // AppointmentModel.SelectedResourceOids = selectedResourceOids.Where(oid => oid.HasValue).Select(oid => oid.Value).ToList(); - return PartialView("ResourceMultiSelectPartial", AppointmentModel); - } + // return PartialView("ResourceMultiSelectPartial", AppointmentModel); + //} - [HttpPost] - public ActionResult EmployeeGridLookupPartial(string value) - { - /* - * Im AppointmentModel müssen die PossibleEmployees bleiben, denn daraus wählt man die Mitarbeiter, die noch nicht mit dem Termin - * verknüpft sind und es müssen - zumindest beim Bearbeiten - die bereits mit dem Termin verbundenen Mitarbeiter-zu-Termin-Relationen - * zwischengespeichert werden. - * - */ - var selectedEmployeeOids = GridLookupExtension.GetSelectedValues("EmployeeGridLookup") ?? Array.Empty(); + //[HttpPost] + //public ActionResult EmployeeGridLookupPartial(string value) + //{ + // /* + // * Im AppointmentModel müssen die PossibleEmployees bleiben, denn daraus wählt man die Mitarbeiter, die noch nicht mit dem Termin + // * verknüpft sind und es müssen - zumindest beim Bearbeiten - die bereits mit dem Termin verbundenen Mitarbeiter-zu-Termin-Relationen + // * zwischengespeichert werden. + // * + // */ + // var selectedEmployeeOids = GridLookupExtension.GetSelectedValues("EmployeeGridLookup") ?? Array.Empty(); - AppointmentModel.SelectedEmployeeOids = selectedEmployeeOids.Where(oid => oid.HasValue).Select(oid => oid.Value).ToList(); + // AppointmentModel.SelectedEmployeeOids = selectedEmployeeOids.Where(oid => oid.HasValue).Select(oid => oid.Value).ToList(); - return PartialView("EmployeeMultiSelectPartial", AppointmentModel); - } + // return PartialView("EmployeeMultiSelectPartial", AppointmentModel); + //} [Authorize] public string SelectActiveViewType(string viewTypeName) @@ -654,7 +655,7 @@ namespace BeWoPlanerMobil.Controllers } [Authorize] - public ActionResult UpdateEmployeeSelection(long[] selectedOids) + public ActionResult UpdateEmployeeFilterSelection(long[] selectedOids) { if(Model is null) { @@ -676,7 +677,7 @@ namespace BeWoPlanerMobil.Controllers } [Authorize] - public ActionResult UpdateCustomerSelection(long[] selectedOids) + public ActionResult UpdateCustomerFilterSelection(long[] selectedOids) { if(Model is null) { @@ -698,7 +699,7 @@ namespace BeWoPlanerMobil.Controllers } [Authorize] - public ActionResult UpdateResourceSelection(long[] selectedOids) + public ActionResult UpdateResourceFilterSelection(long[] selectedOids) { if(Model is null) { @@ -860,5 +861,83 @@ namespace BeWoPlanerMobil.Controllers return PartialView("SchedulerPagePartial", Model); } + + [Authorize] + public string GetEmployeePageCount() + { + return JsonConvert.SerializeObject(new EditFormInfo(AppointmentModel.EmployeePageCount, AppointmentModel.EmployeePageLimit)); + } + + [Authorize] + public string GetCustomerPageCount() + { + return JsonConvert.SerializeObject(new EditFormInfo(AppointmentModel.CustomerPageCount, AppointmentModel.CustomerPageLimit)); + } + + [Authorize] + public string GetResourcePageCount() + { + return JsonConvert.SerializeObject(new EditFormInfo(AppointmentModel.ResourcePageCount, AppointmentModel.ResourcePageLimit)); + } + + [Authorize] + public string UpdateAppointmentEmployeeSelection(string selectedOids) + { + if(selectedOids is null) + { + selectedOids = string.Empty; + } + + var selectedEmployeeOids = selectedOids.Length == 0 ? new List() : selectedOids.Split(',').Select(long.Parse).ToList(); + + AppointmentModel.SelectedEmployee2SchedulerAppointments = new List(); + + var employees = AppointmentModel.PossibleEmployees.Where(possibleEmployee => selectedEmployeeOids.Contains(possibleEmployee.EmployeeOid)).ToList(); + + foreach(var employee in employees) + { + AppointmentModel.SelectedEmployee2SchedulerAppointments.Add(new Employee2SchedulerAppointmentDC { Employee = employee }); + } + + return LeerzeichenFuerGetMethoden; + } + + [Authorize] + public string UpdateAppointmentCustomerSelection(string selectedOids) + { + if(selectedOids is null) + { + selectedOids = string.Empty; + } + + AppointmentModel.SelectedCustomerOids = selectedOids.Length == 0 ? new List() : selectedOids.Split(',').Select(long.Parse).ToList(); + + return LeerzeichenFuerGetMethoden; + } + + [Authorize] + public string UpdateAppointmentResourceSelection(string selectedOids) + { + if(selectedOids is null) + { + selectedOids = string.Empty; + } + + AppointmentModel.SelectedResourceOids = selectedOids.Length == 0 ? new List() : selectedOids.Split(',').Select(long.Parse).ToList(); + + return LeerzeichenFuerGetMethoden; + } + } + + public class EditFormInfo + { + public int PageCount { get; } + public int PageLimit { get; } + + public EditFormInfo(int pageCount, int pageLimit) + { + PageCount = pageCount; + PageLimit = pageLimit; + } } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 434ead370..e11237455 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -1530,7 +1530,7 @@ namespace BeWoPlanerMobil.Controllers if(false == Model.IsInEditingMode) { - if(Model.NewServiceRecord.CostBearer != null && Model.ShowSignature && (Model.NewServiceRecord.ServiceDescription.Category.IsBillable || Model.NewServiceRecord.ServiceDescription.Category.BillableAmount > 0m || Model.NewServiceRecord.ServiceDescription.BillableAmount > 0m)) + if(Model.NewServiceRecord.CostBearer != null && Model.ShowSignature) { var valRes = OperationsService.ValidateServiceRecord(Model.NewServiceRecord, null, 0, null, null); var doppelt = valRes.Count > 0 && valRes.FirstOrDefault(v => v.ResultType == DoppelterEintrag) != null; @@ -1540,8 +1540,7 @@ namespace BeWoPlanerMobil.Controllers var oidList = OperationsService.InsertNewServiceRecords(new List { Model.NewServiceRecord }); Model.LastCreatedServiceRecordOid = oidList[0]; - - + if(Model.IsAllowedToCreateSignature(Model.NewServiceRecord)) { if(Model.NewServiceRecord.CostBearer != null && Model.ShowSignature && (Model.NewServiceRecord.ServiceDescription.Category.IsBillable || Model.NewServiceRecord.ServiceDescription.Category.BillableAmount > 0m || Model.NewServiceRecord.ServiceDescription.BillableAmount > 0m)) diff --git a/BeWoPlanerMobil/Models/AppointmentModel.cs b/BeWoPlanerMobil/Models/AppointmentModel.cs index 05807a792..4717ba820 100644 --- a/BeWoPlanerMobil/Models/AppointmentModel.cs +++ b/BeWoPlanerMobil/Models/AppointmentModel.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; namespace BeWoPlanerMobil.Models { @@ -30,64 +31,16 @@ namespace BeWoPlanerMobil.Models public string CompletedNotice { get; set; } public string CompletedUser { get; set; } public string TaskDescription { get; set; } - - public List SelectedCustomers - { - get - { - return SelectedCustomerOids is null ? - null : - PossibleCustomers.Where(customer => SelectedCustomerOids.Contains(customer.CustomerOid)).ToList(); - } - - set - { - SelectedCustomerOids = value?.Select(customer => customer.CustomerOid).ToList(); - } - } - - public List SelectedResources - { - get - { - return SelectedResourceOids is null ? - null : - PossibleResources.Where(resource => resource.ResourceOid.HasValue && SelectedResourceOids.Contains(resource.ResourceOid.Value)).ToList(); - } - - set - { - SelectedResourceOids = value?.Where(resource => resource.ResourceOid.HasValue).Select(resource => resource.ResourceOid.Value).ToList(); - } - } - public bool HasServiceRecordEntry { get; set; } public List ServiceRecordList { get; set; } - public List PossibleCustomers { get; set; } - public List PossibleResources { get; set; } - - - public List SelectedCustomerOids - { - get => AppointmentSessionModel.SelectedCustomerOids; - set => AppointmentSessionModel.SelectedCustomerOids = value; - } - - - - public List SelectedResourceOids - { - get => AppointmentSessionModel.SelectedResourceOids; - set => AppointmentSessionModel.SelectedResourceOids = value; - } - - - - - /* Mitarbeiter */ + #region Mitarbeiter public List PossibleEmployees { get; set; } + public int EmployeePageLimit => 10; + + public int EmployeePageCount => (PossibleEmployees?.Count ?? 0) / EmployeePageLimit; + public List SelectedEmployee2SchedulerAppointments { get; set; } public List SelectedEmployees { get; set; } @@ -103,12 +56,64 @@ namespace BeWoPlanerMobil.Models get => AppointmentSessionModel.SelectedEmployees2Appointments; set => AppointmentSessionModel.SelectedEmployees2Appointments = value; } - /* /Mitarbeiter */ + #endregion + #region Klienten + public List PossibleCustomers { get; set; } + public int CustomerPageLimit => 10; + public int CustomerPageCount => (PossibleCustomers?.Count ?? 0) / CustomerPageLimit; + public List SelectedCustomers + { + get + { + return SelectedCustomerOids is null ? null : PossibleCustomers.Where(customer => SelectedCustomerOids.Contains(customer.CustomerOid)).ToList(); + } + set + { + SelectedCustomerOids = value?.Select(customer => customer.CustomerOid).ToList(); + } + } + + public List SelectedCustomerOids + { + get => AppointmentSessionModel.SelectedCustomerOids; + set => AppointmentSessionModel.SelectedCustomerOids = value; + } + #endregion + + #region Ressourcen + public Dictionary> ResourceCategories2Resources { get; set; } + public List PossibleResources { get; set; } + + public int ResourcePageLimit => 10; + + public int ResourcePageCount => (ResourceCategories2Resources?.Keys?.Count ?? 0) / ResourcePageLimit; + + public List SelectedResources + { + get + { + return SelectedResourceOids is null ? + null : + PossibleResources.Where(resource => resource.ResourceOid.HasValue && SelectedResourceOids.Contains(resource.ResourceOid.Value)).ToList(); + } + + set + { + SelectedResourceOids = value?.Where(resource => resource.ResourceOid.HasValue).Select(resource => resource.ResourceOid.Value).ToList(); + } + } + + public List SelectedResourceOids + { + get => AppointmentSessionModel.SelectedResourceOids; + set => AppointmentSessionModel.SelectedResourceOids = value; + } + #endregion public AppointmentModel() @@ -122,6 +127,13 @@ namespace BeWoPlanerMobil.Models PossibleResources = possibleResources; PossibleEmployees = possibleEmployees; + ResourceCategories2Resources = new Dictionary>(); + + foreach(var resource in PossibleResources) + { + ResourceCategories2Resources.AddOrUpdateValueInDictionary(resource.ResourceCategory, resource); + } + SessionModel = new AppointmentSessionModel(); } diff --git a/BeWoPlanerMobil/Models/AppointmentSessionModel.cs b/BeWoPlanerMobil/Models/AppointmentSessionModel.cs index 6082de86e..50d7814be 100644 --- a/BeWoPlanerMobil/Models/AppointmentSessionModel.cs +++ b/BeWoPlanerMobil/Models/AppointmentSessionModel.cs @@ -4,20 +4,20 @@ namespace BeWoPlanerMobil.Models { public class AppointmentSessionModel : BaseSessionModel { - public List SelectedCustomerOids { get; set; } public List SelectedEmployeeOids { get; set; } + public List SelectedCustomerOids { get; set; } public List SelectedResourceOids { get; set; } - public List SelectedEmployees2Appointments { get; set; } + public List SelectedEmployees2Appointments { get; set; } = new List(); public override void ResetValues() { base.ResetValues(); - SelectedCustomerOids = null; - SelectedEmployeeOids = null; - SelectedResourceOids = null; - SelectedEmployees2Appointments = null; + SelectedCustomerOids = new List(); + SelectedEmployeeOids = new List(); + SelectedResourceOids = new List(); + SelectedEmployees2Appointments = new List(); } } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Models/DevExpressSchedulerModel.cs b/BeWoPlanerMobil/Models/DevExpressSchedulerModel.cs index 667eeda70..7d5f8d1c9 100644 --- a/BeWoPlanerMobil/Models/DevExpressSchedulerModel.cs +++ b/BeWoPlanerMobil/Models/DevExpressSchedulerModel.cs @@ -103,29 +103,6 @@ namespace BeWoPlanerMobil.Models public List SelectedCustomersForFiltering { get; set; } public List SelectedResourcesForFiltering { get; set; } - public List SelectedEmployeesForIntervalFinder { get; set; } - public List SelectedCustomersForIntervalFinder { get; set; } - public List SelectedResourcesForIntervalFinder { get; set; } - - - - public List SelectedEmployeeOidsForIntervalFinder - { - get => DevExpressSchedulerSessionModel.SelectedEmployeeOidsForIntervalFinder; - set => DevExpressSchedulerSessionModel.SelectedEmployeeOidsForIntervalFinder = value; - } - - public List SelectedCustomerOidsForIntervalFinder - { - get => DevExpressSchedulerSessionModel.SelectedCustomerOidsForIntervalFinder; - set => DevExpressSchedulerSessionModel.SelectedCustomerOidsForIntervalFinder = value; - } - - public List SelectedResourceOidsForIntervalFinder - { - get => DevExpressSchedulerSessionModel.SelectedResourceOidsForIntervalFinder; - set => DevExpressSchedulerSessionModel.SelectedResourceOidsForIntervalFinder = value; - } public bool ShowTasks { diff --git a/BeWoPlanerMobil/Models/DevExpressSchedulerSessionModel.cs b/BeWoPlanerMobil/Models/DevExpressSchedulerSessionModel.cs index 33e65f2f5..8979a1800 100644 --- a/BeWoPlanerMobil/Models/DevExpressSchedulerSessionModel.cs +++ b/BeWoPlanerMobil/Models/DevExpressSchedulerSessionModel.cs @@ -14,10 +14,6 @@ namespace BeWoPlanerMobil.Models public List SelectedCustomerOidsForFiltering { get; set; } public List SelectedResourceOidsForFiltering { get; set; } - public List SelectedEmployeeOidsForIntervalFinder { get; set; } - public List SelectedCustomerOidsForIntervalFinder { get; set; } - public List SelectedResourceOidsForIntervalFinder { get; set; } - public List OpenAppointmentOids { get; set; } public long? AppointmentOid2Answer { get; set; } @@ -44,10 +40,6 @@ namespace BeWoPlanerMobil.Models SelectedCustomerOidsForFiltering = new List(); SelectedResourceOidsForFiltering = new List(); - SelectedEmployeeOidsForIntervalFinder = new List(); - SelectedCustomerOidsForIntervalFinder = new List(); - SelectedResourceOidsForIntervalFinder = new List(); - OpenAppointmentOids = new List(); ShowTasks = false; diff --git a/BeWoPlanerMobil/Views/Customer/Customer.cshtml b/BeWoPlanerMobil/Views/Customer/Customer.cshtml index c96a8f8bb..79fe487a2 100644 --- a/BeWoPlanerMobil/Views/Customer/Customer.cshtml +++ b/BeWoPlanerMobil/Views/Customer/Customer.cshtml @@ -1068,7 +1068,7 @@
-
+
@Html.Partial("CustomerBetreuungPartial", Model)
diff --git a/BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml index 4dbacb741..e03dc0c2f 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml @@ -10,111 +10,93 @@ @if(hasRelatedEmployees && Model.SelectedCustomer != null) { -
-
-
- -
-
- -
-
-
-
-
- @foreach(var relation in Model.SelectedCustomer.RelatedEmployees) - { - var start = relation.StartDate.HasValue ? $"{relation.StartDate.Value:dd.MM.yyyy}" : ""; - var end = relation.EndDate.HasValue ? $"{relation.EndDate.Value:dd.MM.yyyy}" : ""; + foreach(var relation in Model.SelectedCustomer.RelatedEmployees) + { + var start = relation.StartDate.HasValue ? $"{relation.StartDate.Value:dd.MM.yyyy}" : ""; + var end = relation.EndDate.HasValue ? $"{relation.EndDate.Value:dd.MM.yyyy}" : ""; - var relationRole = relation.RelationRole?.DisplayName ?? string.Empty; + var relationRole = relation.RelationRole?.DisplayName ?? string.Empty; -
-
-
- - - - - - - - - - - @if(!string.IsNullOrWhiteSpace(start)) - { - - - - - } - @if(!string.IsNullOrWhiteSpace(end)) - { - - - - - } - @if(!string.IsNullOrWhiteSpace(relation.Notice)) - { - - - - - } - -
Betreuer:@relation.Employee
Rolle:@relationRole
Startdatum:@start
Enddatum:@end
Erläuterung:@relation.Notice
-
-
-
- } +
+
+
+ + + + + + + + + + + @if(!string.IsNullOrWhiteSpace(start)) + { + + + + + } + @if(!string.IsNullOrWhiteSpace(end)) + { + + + + + } + @if(!string.IsNullOrWhiteSpace(relation.Notice)) + { + + + + + } + +
Betreuer:@relation.Employee
Rolle:@relationRole
Startdatum:@start
Enddatum:@end
Erläuterung:@relation.Notice
-
+ } } @*Teams*@ @if(hasRelatedTeams && Model.SelectedCustomer != null) { -
-
-
- +
+
+
+ +
+
+ +
-
- -
-
-
-
- @foreach(var teamRelation in Model.SelectedCustomer.RelatedTeams) - { -
-
-
-
- - - - - - - -
Team:@teamRelation.Team.Name
+
+
+ @foreach(var teamRelation in Model.SelectedCustomer.RelatedTeams) + { +
+
+
+
+ + + + + + + +
Team:@teamRelation.Team.Name
+
+
-
+ }
- }
-
- + } \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltCustomersPartial.cshtml b/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltCustomersPartial.cshtml index 8c83b785d..6b20d7ddd 100644 --- a/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltCustomersPartial.cshtml +++ b/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltCustomersPartial.cshtml @@ -52,7 +52,7 @@ showSpinner(); $("#customer-input-container").load( - "@Url.Action("UpdateCustomerSelection")", + "@Url.Action("UpdateCustomerFilterSelection")", { selectedOids: selectedCustomerOids }, () => { scheduler.Refresh(); diff --git a/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltEmployeesPartial.cshtml b/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltEmployeesPartial.cshtml index ef6d6e359..da9bd3ddf 100644 --- a/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltEmployeesPartial.cshtml +++ b/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltEmployeesPartial.cshtml @@ -62,7 +62,7 @@ logInfo3(`Es wurden ${selectedEmployeeOids.length} Mitarbeiter ausgewählt.`); $("#employee-input-container").load( - "@Url.Action("UpdateEmployeeSelection", "DevExpressScheduler")", + "@Url.Action("UpdateEmployeeFilterSelection", "DevExpressScheduler")", { selectedOids: selectedEmployeeOids }, diff --git a/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltResourcesPartial.cshtml b/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltResourcesPartial.cshtml index 7d1b85ad2..d7edf7e88 100644 --- a/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltResourcesPartial.cshtml +++ b/BeWoPlanerMobil/Views/DevExpressScheduler/AptFltResourcesPartial.cshtml @@ -27,7 +27,7 @@ showSpinner(); $("#resource-input-container").load( - "@Url.Action("UpdateResourceSelection")", + "@Url.Action("UpdateResourceFilterSelection")", { selectedOids: selectedResourceOids }, diff --git a/BeWoPlanerMobil/Views/DevExpressScheduler/CustomAppointmentFormPartial.cshtml b/BeWoPlanerMobil/Views/DevExpressScheduler/CustomAppointmentFormPartial.cshtml index ae08df97b..6e39461a1 100644 --- a/BeWoPlanerMobil/Views/DevExpressScheduler/CustomAppointmentFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/DevExpressScheduler/CustomAppointmentFormPartial.cshtml @@ -6,6 +6,7 @@ @{ Html.EnableClientValidation(); Html.EnableUnobtrusiveJavaScript(); + } @functions { - string GetParticipationColor(ParticipationAnswer participationAnswer) - { - var background = ""; + static string GetParticipationColor(ParticipationAnswer participationAnswer) + { + var background = ""; - switch(participationAnswer) - { - case ParticipationAnswer.Zusage: - background = "#48D44E"; - break; - case ParticipationAnswer.Vorbehalt: - background = "#B927D9"; - break; - case ParticipationAnswer.Absage: - background = "#AB0030"; - break; - } + switch(participationAnswer) + { + case ParticipationAnswer.Zusage: + background = "#48D44E"; + break; + case ParticipationAnswer.Vorbehalt: + background = "#B927D9"; + break; + case ParticipationAnswer.Absage: + background = "#AB0030"; + break; + } - return background; - } + return background; + } } -
- -
- Action - Another action - Something else here +@{ + var areAllSelected = Model.SelectedEmployee2SchedulerAppointments.Select(x => x.Employee.EmployeeOid).ToList().AreListEqual(Model.PossibleEmployees.Select(employee => employee.EmployeeOid).ToList()); - @foreach(var employee in Model.PossibleEmployees) - { - var isChecked = Model.SelectedEmployeeOids.Contains(employee.EmployeeOid) ? "checked" : string.Empty; - var employee2Appointment = Model.SelectedEmployee2SchedulerAppointments.FirstOrDefault(e2A => e2A.Employee.EmployeeOid.Equals(employee.EmployeeOid)); + var allChecked = areAllSelected ? "checked" : string.Empty; +} - var background = ""; +
\ No newline at end of file diff --git a/BeWoPlanerMobil/Views/DevExpressScheduler/DevExpressScheduler.cshtml b/BeWoPlanerMobil/Views/DevExpressScheduler/DevExpressScheduler.cshtml index cd92e4c77..3d7297c28 100644 --- a/BeWoPlanerMobil/Views/DevExpressScheduler/DevExpressScheduler.cshtml +++ b/BeWoPlanerMobil/Views/DevExpressScheduler/DevExpressScheduler.cshtml @@ -22,6 +22,20 @@ const vw = $(window).width(); + if(editFormPopup.outerWidth() !== undefined) { + $.get("@Url.Action("GetEmployeePageCount")", function(editFormInfo) { + pageCountCallback(editFormInfo, "emp"); + }); + + $.get("@Url.Action("GetCustomerPageCount")", function(editFormInfo) { + pageCountCallback(editFormInfo, "cus"); + }); + + $.get("@Url.Action("GetResourcePageCount")", function(editFormInfo) { + pageCountCallback(editFormInfo, "res"); + }); + } + if(editFormPopup.outerWidth() !== undefined && vw < 678) { const newWidth = vw * .95; @@ -51,6 +65,31 @@ } } + function pageCountCallback(editFormInfo, prefix) { + const info = JSON.parse(editFormInfo); + const items = $(`#dropdown-${prefix}-itm-container .dropdown-item`); + + switch(prefix) { + case "emp": + aptEmpSelPageCount = info.PageCount; + aptEmpSelPageLimit = info.PageLimit; + aptEmpSelItems = items; + break; + case "cus": + aptCusSelPageCount = info.PageCount; + aptCusSelPageLimit = info.PageLimit; + aptCusSelItems = items; + break; + case "res": + aptResSelPageCount = info.PageCount; + aptResSelPageLimit = info.PageLimit; + aptResSelItems = items; + break; + } + + window.buildPagination(1, 5, 1, prefix); + } + function OnAppointmentFormSave(s, e) { if(IsValidAppointment()) { scheduler.AppointmentFormSave(); @@ -68,6 +107,7 @@ CustomerGridLookup.HideDropDown(); } + // ToDo: Löschen function CloseEmployeeGridLookup() { EmployeeGridLookup.ConfirmCurrentSelection(); EmployeeGridLookup.HideDropDown(); @@ -117,7 +157,7 @@ } function OnAppointmentMenuPopup(s, e) { - const id = scheduler.GetSelectedAppointmentIds()[0]; + const id = scheduler.GetSelectedAppointmentIds()[0]; const selectedAppointment = scheduler.GetAppointmentById(id); for(let i = 0; i < e.item.items.length; i++) { @@ -125,14 +165,14 @@ switch(currentItem.name) { case "ToServiceRecord": - if(id === undefined || selectedAppointment.IsAbsenceTime || selectedAppointment.IsTask) { - currentItem.SetVisible(false); + if(id === undefined || selectedAppointment.IsAbsenceTime || selectedAppointment.IsTask) { + currentItem.SetVisible(false); } break; case "ConfirmApt": if(id === undefined || selectedAppointment.CanConfirm === false) { - currentItem.SetVisible(false); + currentItem.SetVisible(false); } break; case "MaybeApt": @@ -174,8 +214,8 @@ scheduler.PerformCallback({ apptID: "", - actionId: "FilterAppointments", - args: [selectedBoxes] + actionId: "FilterAppointments", + args: [selectedBoxes] }); } @@ -189,15 +229,15 @@ switch(filterType) { case "employee": - url = "@Url.Action("UpdateEmployeeSelection")"; + url = "@Url.Action("UpdateEmployeeFilterSelection")"; getSelectedCountUrl = "@Url.Action("GetSelectedEmployeesForAptFlt")"; break; case "customer": - url = "@Url.Action("UpdateCustomerSelection")"; + url = "@Url.Action("UpdateCustomerFilterSelection")"; getSelectedCountUrl = "@Url.Action("GetSelectedCustomersForAptFlt")"; break; case "resource": - url = "@Url.Action("UpdateResourceSelection")"; + url = "@Url.Action("UpdateResourceFilterSelection")"; getSelectedCountUrl = "@Url.Action("GetSelectedResourcesForAptFlt")"; break; } @@ -216,12 +256,304 @@ } function performReload() { - $("#scheduler-notification-container").load("@Url.Action("GetNotifications")"); + $("#scheduler-notification-container").load("@Url.Action("GetNotifications")"); } function reloadScheduler() { scheduler.PerformCallback({ apptID: "", actionId: "Reload", args: null }, () => { performReload(); hideSpinner(); }); } + + @* CustomECRSelectionPartial *@ + function onNewSearchInput(prefix) { + var searchText = $(`#${prefix}-drop-search-input`).val(); + + const menuItems = $(`#dropdown-${prefix}-itm-container .dropdown-item`); + + if(searchText === null || searchText === undefined || searchText.length === 0) { + menuItems.show(); + return; + } + + menuItems.hide(); + + $.each(menuItems, + function(index, item) { + const itemText = $(item).text().toLowerCase(); + + if(itemText.includes(searchText.toLowerCase())) { + $(item).show(); + } + } + ); + } + + function resetNewSearch(prefix) { + $(`#${prefix}-drop-search-input`).val(""); + + buildPagination(1, 5, 1, prefix); + showPage(1, prefix); + + const e = window.event; + e.cancelBubble = true; + + if(e.stopPropagation) { + e.stopPropagation(); + } + } + + var aptEmpSelPageCount = 0; + var aptEmpSelItems = []; + var aptEmpSelCurrentPage = 1; + var aptEmpSelPageLimit = 0; + + var aptCusSelPageCount = 0; + var aptCusSelItems = []; + var aptCusSelCurrentPage = 1; + var aptCusSelPageLimit = 0; + + var aptResSelPageCount = 0; + var aptResSelItems = []; + var aptResSelCurrentPage = 1; + var aptResSelPageLimit = 0; + + function buildPagination(firstShownButton, lastShownButton, activeButton, prefix) { + const pagination = $(`#apt-${prefix}-pagination`); + pagination.empty(); + + var pageCount = 1; + var currentPage = 1; + + switch(prefix) { + case "emp": + pageCount = aptEmpSelPageCount; + currentPage = aptEmpSelCurrentPage; + break; + case "cus": + pageCount = aptCusSelPageCount; + currentPage = aptCusSelCurrentPage; + break; + case "res": + pageCount = aptResSelPageCount; + currentPage = aptResSelCurrentPage; + break; + } + + if(prefix === "res") { + logInfo2(`Es gibt ${pageCount} Seiten für die Ressourcen`); + } + + if(pageCount <= 1) { + $(`#apt-${prefix}-pag-divider, #apt-${prefix}-pag-dropdow-item`).hide(); + return; + } + + $(`#apt-${prefix}-pag-divider, #apt-${prefix}-pag-dropdow-item`).show(); + + var limit = lastShownButton; + + if(pageCount < limit) { + limit = pageCount; + } + + const firstPageLiClass = firstShownButton === 1 ? "page-item disabled" : "page-igem"; + const lastPageLiClass = lastShownButton === pageCount ? "page-item disabled" : "page-igem"; + + const prevPageLiClass = activeButton === 1 ? "page-item disabled" : "page-item"; + const nextPageLiClass = activeButton === pageCount ? "page-item disabled" : "page-igem"; + + $(`
    • `).appendTo(pagination); + $(`
    • `).appendTo(pagination); + + for(let i = firstShownButton; i <= limit; i++) { + $(`
    • `).appendTo(pagination); + } + + $(`
    • `).appendTo(pagination); + $(`
    • `).appendTo(pagination); + } + + function showPage(page, prefix) { + var pageCount = 1; + var items = []; + + switch(prefix) { + case "emp": + pageCount = aptEmpSelPageCount; + items = aptEmpSelItems; + break; + case "cus": + pageCount = aptCusSelPageCount; + items = aptCusSelItems; + break; + case "res": + pageCount = aptResSelPageCount; + items = aptResSelItems; + break; + } + + const total = (items.length / 10) | 0; + const currentPage = Math.max(1, Math.min(page, total)); + + switch(prefix) { + case "emp": + aptEmpSelCurrentPage = currentPage; + break; + case "cus": + aptCusSelCurrentPage = currentPage; + break; + case "res": + aptResSelCurrentPage = currentPage; + break; + } + + const start = (currentPage - 1) * 10; + const end = currentPage * 10; + + items.hide(); + + $.each(items.slice(start, end), function(index, item) { + $(item).removeClass("d-none"); + $(item).show(); + }); + + const last = Math.min(pageCount, currentPage + 2); + const first = Math.max(1, last - 4); + + buildPagination(first, last, currentPage, prefix); + } + + function updateEmployeeCustomerResourceSelection(prefix) { + const checkedBoxes = $(`#dropdown-${prefix}-itm-container input[type=checkbox]:checked`); + + var url = ""; + + switch(prefix) { + case "emp": + url = "@Url.Action("UpdateAppointmentEmployeeSelection")"; + break; + case "cus": + url = "@Url.Action("UpdateAppointmentCustomerSelection")"; + break; + case "res": + url = "@Url.Action("UpdateAppointmentResourceSelection")"; + break; + } + + var selectedOids = []; + + checkedBoxes.each(function() { + const id = $(this).prop("id"); + + const employeeOid = id.split("-")[3]; + + selectedOids.push(employeeOid.toString()); + }); + + showSpinner(); + $.get( + url, + { selectedOids: selectedOids.join(", ") }, + function() { + hideSpinner(); + }); + } + + function selectAllEmployeeCustomerResource(prefix) { + const isChecked = $(`#apt-${prefix}-select-all`).prop("checked"); + + $(`#dropdown-${prefix}-itm-container input[type=checkbox]`).prop("checked", isChecked); + + updateEmployeeCustomerResourceSelection(prefix); + } + + function categoryCardHeaderClick(collapsibleId) { + const collapsible = $(`#${collapsibleId}`); + + if(collapsible.length === false) { + return; + } + + collapsible.collapse("toggle"); + + const e = window.event; + e.cancelBubble = true; + + if(e.stopPropagation) { + e.stopPropagation(); + } + } + + function onNewResourceSeachInput() { + var searchText = $(`#res-drop-search-input`).val().toLowerCase(); + + const category2Resources = $(`#dropdown-res-itm-container .dropdown-item`); + const collapse = $(`#dropdown-res-itm-container .dropdown-item .collapse`); + + if(searchText === null || searchText === undefined || searchText.length === 0) { + showAllResources(); + return; + } + + category2Resources.hide(); + + $.each(category2Resources, + function(index, item) { + const categoryName = $(item).find("h6").text().toLowerCase(); + + if(categoryName.includes(searchText)) { + $(item).show(); + } + + const resources = $(item).find("form"); + + resources.hide(); + + $.each(resources, function(resourceIndex, resourceItem) { + const itemText = $(resourceItem).text().toLowerCase(); + + if(itemText.includes(searchText)) { + $(resourceItem).show(); + $(item).show(); + collapse.collapse("show"); + } + }); + } + ); + } + + function resetNewResourceSearch() { + $(`#res-drop-search-input`).val(""); + + showAllResources(); + + buildPagination(1, 5, 1, "res"); + showPage(1, "res"); + + const e = window.event; + e.cancelBubble = true; + + if(e.stopPropagation) { + e.stopPropagation(); + } + } + + function showAllResources() { + const category2Resources = $(`#dropdown-res-itm-container .dropdown-item`); + const collapse = $(`#dropdown-res-itm-container .dropdown-item .collapse`); + + $.each(category2Resources, function(cardIndex, card) { + $(card).show(); + + const resources = $(item).find("form"); + + $.each(resources, function(formIndex, form) { + $(form).show(); + }); + }); + + collapse.collapse("show"); + } + @* /CustomECRSelectionPartial *@
    diff --git a/BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerPagePartial.cshtml b/BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerPagePartial.cshtml index 8841ad3fc..a1c9bcde5 100644 --- a/BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerPagePartial.cshtml +++ b/BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerPagePartial.cshtml @@ -253,6 +253,8 @@ SelectedEmployee2SchedulerAppointments = employees2Appointment, SelectedCustomers = customerList, SelectedResources = resourceList, + SelectedCustomerOids = customerList?.Select(customer => customer.CustomerOid)?.ToList() ?? new List(), + SelectedResourceOids = resourceList?.Select(resource => resource.ResourceOid.Value)?.ToList() ?? new List(), SelectedEmployeeOids = employees2Appointment.Select(employee2Appointment => employee2Appointment.Employee.EmployeeOid).ToList(), CompletedNotice = container.Appointment.CustomFields["CompletedNotice"]?.ToString(), CompletedUser = container.Appointment.CustomFields["CompletedUser"]?.ToString(), diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 0a35c98fb..f0a494b9e 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -69,7 +69,7 @@ namespace BeWo.Service.Plugins //t = "5351926758"; // Viva a Vida //t = "2215396183"; // Diakonie Remscheid Lennep //t = "5157599087"; // SHG Schwerte - t = "4526293996"; // Fortis + //t = "4526293996"; // Fortis //t = "3647969417"; // Caritas Bottrop //t = "3057313346"; // SSB Mainz //t = "6246287823"; // BeWo Alsdorf @@ -151,7 +151,7 @@ namespace BeWo.Service.Plugins //t = "4595275645"; // Eigenständig //t = "7912635399"; // Prof. Dr. Eggers Stiftung //t = "3549726254"; // Socia - //t = "1992495802"; // Monvita + t = "1992495802"; // Monvita //t = "7381352241"; // Ressource e.V. //t = "3607551608"; // Betreuungsbüro Scholz //t = "3104936392"; // B.A.P. Bielefelder Ambulante Pflege @@ -212,7 +212,7 @@ namespace BeWo.Service.Plugins //t = "7185105541"; // Nous GmbH //t = "5022131330"; // Tabula Rasa //t = "4189934785"; // Landshuter Netzwerke - t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR + //t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR //t = "3678599942"; // VKM Rietberg //t = "4069072369"; // BeWo Dreilich&Pastor (Projekt TranskulturellesBBPastor) //t = "4160851689"; // BeWo Dreilich&Pastor (Dreilich) diff --git a/Shared/Core/Utilities/WebUtils.cs b/Shared/Core/Utilities/WebUtils.cs index 0c6a23381..6841fbe02 100644 --- a/Shared/Core/Utilities/WebUtils.cs +++ b/Shared/Core/Utilities/WebUtils.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Text.RegularExpressions; namespace BS.Shared.Core.Utilities { @@ -15,5 +12,15 @@ namespace BS.Shared.Core.Utilities var url = uri.ToString(); return url; } - } + + public static bool CheckColorString(string colorString) + { + if(string.IsNullOrWhiteSpace(colorString)) + { + return false; + } + + return Regex.IsMatch(colorString, @"^#[0-9A-Fa-f]{6}$"); + } + } }