diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 540d2cc59..5212d421f 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -27,7 +27,7 @@ false - 3.7 + 4.3 true diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user index 059ea230a..2e25948f0 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user @@ -22,6 +22,7 @@ False MvcViewScaffolder root/Common/MVC/View + 3.7 diff --git a/BeWoPlanerMobil/Controllers/CustomerController.cs b/BeWoPlanerMobil/Controllers/CustomerController.cs index 46c0be946..e1297ecb5 100644 --- a/BeWoPlanerMobil/Controllers/CustomerController.cs +++ b/BeWoPlanerMobil/Controllers/CustomerController.cs @@ -10,6 +10,7 @@ using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; using DevExpress.XtraReports.UI; namespace BeWoPlanerMobil.Controllers @@ -197,7 +198,7 @@ namespace BeWoPlanerMobil.Controllers if(isAllowedToEdit && Model.SelectedCustomer != null) { - Model.SelectedCustomer.Notice = newNotice; + Model.SelectedCustomer.Notice = newNotice?.RemoveUppercaseEsszett(); var customerOid = CustomerService.UpdateCustomer(Model.SelectedCustomer); Model.SelectedCustomer = CustomerService.LoadCustomer(customerOid); @@ -257,29 +258,27 @@ namespace BeWoPlanerMobil.Controllers return Logout(); } - // ToDo: Stammdaten aus formCollection holen, validieren und Customer-Objekt aktualisieren. + var firstname = formCollection["vorname"]?.RemoveUppercaseEsszett(); + var lastname = formCollection["nachname"]?.RemoveUppercaseEsszett(); + var geburtdatum = formCollection["geburtstag"]?.RemoveUppercaseEsszett(); + var geschlecht = formCollection["geschlecht"]?.RemoveUppercaseEsszett(); - var firstname = formCollection["vorname"]; - var lastname = formCollection["nachname"]; - var geburtdatum = formCollection["geburtstag"]; - var geschlecht = formCollection["geschlecht"]; + var adresszusatz = formCollection["adresszusatz"]?.RemoveUppercaseEsszett(); + var street = formCollection["strasse"]?.RemoveUppercaseEsszett(); + var postalCode = formCollection["plz"]?.RemoveUppercaseEsszett(); + var city = formCollection["ort"]?.RemoveUppercaseEsszett(); - var adresszusatz = formCollection["adresszusatz"]; - var street = formCollection["strasse"]; - var postalCode = formCollection["plz"]; - var city = formCollection["ort"]; + var nameInvoiceAddress = formCollection["name-rechnungsadresse"]?.RemoveUppercaseEsszett(); + var streetInvoiceAddress = formCollection["strasse-rechnungsadresse"]?.RemoveUppercaseEsszett(); + var postalCodeInvoiceAddress = formCollection["plz-rechnungsadresse"]?.RemoveUppercaseEsszett(); + var cityInvoiceAddress = formCollection["ort-rechnungsadresse"]?.RemoveUppercaseEsszett(); - var nameInvoiceAddress = formCollection["name-rechnungsadresse"]; - var streetInvoiceAddress = formCollection["strasse-rechnungsadresse"]; - var postalCodeInvoiceAddress = formCollection["plz-rechnungsadresse"]; - var cityInvoiceAddress = formCollection["ort-rechnungsadresse"]; + var mobile = formCollection["handy"]?.RemoveUppercaseEsszett(); + var phone = formCollection["telefon"]?.RemoveUppercaseEsszett(); + var fax = formCollection["fax"]?.RemoveUppercaseEsszett(); + var eMailAddress = formCollection["mail"]?.RemoveUppercaseEsszett(); - var mobile = formCollection["handy"]; - var phone = formCollection["telefon"]; - var fax = formCollection["fax"]; - var eMailAddress = formCollection["mail"]; - - var notice = formCollection["notiz"]; + var notice = formCollection["notiz"]?.RemoveUppercaseEsszett(); var customer = Model.SelectedCustomer; diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index c776a2057..752a6db5c 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -935,10 +935,10 @@ namespace BeWoPlanerMobil.Controllers int.TryParse(collection[FormCollectionConstants.DurationKey], out dauer); } - var doku2 = collection[FormCollectionConstants.Dokumentation2Key]; - var doku3 = collection[FormCollectionConstants.Dokumentation3Key]; - var doku4 = collection[FormCollectionConstants.Dokumentation4Key]; - var doku5 = collection[FormCollectionConstants.Dokumentation5Key]; + var doku2 = collection[FormCollectionConstants.Dokumentation2Key]?.RemoveUppercaseEsszett(); + var doku3 = collection[FormCollectionConstants.Dokumentation3Key]?.RemoveUppercaseEsszett(); + var doku4 = collection[FormCollectionConstants.Dokumentation4Key]?.RemoveUppercaseEsszett(); + var doku5 = collection[FormCollectionConstants.Dokumentation5Key]?.RemoveUppercaseEsszett(); var zeitenFeld = new DateTime[2]; @@ -1039,12 +1039,12 @@ namespace BeWoPlanerMobil.Controllers Model.NewServiceRecord.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitEndDatum; } - Model.NewServiceRecord.Notice = string.IsNullOrEmpty(doku1) ? null : doku1; + Model.NewServiceRecord.Notice = string.IsNullOrEmpty(doku1) ? null : doku1?.RemoveUppercaseEsszett(); - Model.NewServiceRecord.Notice2 = string.IsNullOrEmpty(doku2) ? null : doku2; - Model.NewServiceRecord.Notice3 = string.IsNullOrEmpty(doku3) ? null : doku3; - Model.NewServiceRecord.Notice4 = string.IsNullOrEmpty(doku4) ? null : doku4; - Model.NewServiceRecord.Notice5 = string.IsNullOrEmpty(doku5) ? null : doku5; + Model.NewServiceRecord.Notice2 = string.IsNullOrEmpty(doku2) ? null : doku2?.RemoveUppercaseEsszett(); + Model.NewServiceRecord.Notice3 = string.IsNullOrEmpty(doku3) ? null : doku3?.RemoveUppercaseEsszett(); + Model.NewServiceRecord.Notice4 = string.IsNullOrEmpty(doku4) ? null : doku4?.RemoveUppercaseEsszett(); + Model.NewServiceRecord.Notice5 = string.IsNullOrEmpty(doku5) ? null : doku5?.RemoveUppercaseEsszett(); var serviceDescOid = 0L; @@ -1206,11 +1206,11 @@ namespace BeWoPlanerMobil.Controllers CustomerCount = personCount, StartDate = Model.NewServiceRecord.Start, EndDate = Model.NewServiceRecord.End, - Notice = Model.NewServiceRecord.Notice, - Notice2 = Model.NewServiceRecord.Notice2, - Notice3 = Model.NewServiceRecord.Notice3, - Notice4 = Model.NewServiceRecord.Notice4, - Notice5 = Model.NewServiceRecord.Notice5, + Notice = Model.NewServiceRecord.Notice?.RemoveUppercaseEsszett(), + Notice2 = Model.NewServiceRecord.Notice2?.RemoveUppercaseEsszett(), + Notice3 = Model.NewServiceRecord.Notice3?.RemoveUppercaseEsszett(), + Notice4 = Model.NewServiceRecord.Notice4?.RemoveUppercaseEsszett(), + Notice5 = Model.NewServiceRecord.Notice5?.RemoveUppercaseEsszett(), ServiceRecordList = newDCList }; @@ -1309,22 +1309,22 @@ namespace BeWoPlanerMobil.Controllers Model.NewServiceRecord.RoundedDuration = roundedDuration; Model.NewServiceRecord.GroupRoundedDuration = groupDuration; - group.Notice = Model.NewServiceRecord.Notice; - group.Notice2 = Model.NewServiceRecord.Notice2; - group.Notice3 = Model.NewServiceRecord.Notice3; - group.Notice4 = Model.NewServiceRecord.Notice4; - group.Notice5 = Model.NewServiceRecord.Notice5; + group.Notice = Model.NewServiceRecord.Notice?.RemoveUppercaseEsszett(); + group.Notice2 = Model.NewServiceRecord.Notice2?.RemoveUppercaseEsszett(); + group.Notice3 = Model.NewServiceRecord.Notice3?.RemoveUppercaseEsszett(); + group.Notice4 = Model.NewServiceRecord.Notice4?.RemoveUppercaseEsszett(); + group.Notice5 = Model.NewServiceRecord.Notice5?.RemoveUppercaseEsszett(); group.RoundedDuration = groupDuration; group.StartDate = Model.NewServiceRecord.Start; group.EndDate = Model.NewServiceRecord.End; foreach(var item in group.ServiceRecordList) { - item.Notice = Model.NewServiceRecord.Notice; - item.Notice2 = Model.NewServiceRecord.Notice2; - item.Notice3 = Model.NewServiceRecord.Notice3; - item.Notice4 = Model.NewServiceRecord.Notice4; - item.Notice5 = Model.NewServiceRecord.Notice5; + item.Notice = Model.NewServiceRecord.Notice?.RemoveUppercaseEsszett(); + item.Notice2 = Model.NewServiceRecord.Notice2?.RemoveUppercaseEsszett(); + item.Notice3 = Model.NewServiceRecord.Notice3?.RemoveUppercaseEsszett(); + item.Notice4 = Model.NewServiceRecord.Notice4?.RemoveUppercaseEsszett(); + item.Notice5 = Model.NewServiceRecord.Notice5?.RemoveUppercaseEsszett(); item.End = Model.NewServiceRecord.End; item.Start = Model.NewServiceRecord.Start; item.RoundedDuration = roundedDuration; @@ -2539,11 +2539,11 @@ namespace BeWoPlanerMobil.Controllers return; } + ResetModel(); + Model.IsInGroupBookingMode = bookingMode == BookingMode.GroupBookingMode; Model.IsInMultiBookingMode = bookingMode == BookingMode.MultiBookingMode; - ResetModel(); - if(bookingMode == BookingMode.GroupBookingMode) { ResetMultiBookingMode(); @@ -3302,7 +3302,7 @@ namespace BeWoPlanerMobil.Controllers { Employee = employee, Customer = customer, - Notice = notice, + Notice = notice?.RemoveUppercaseEsszett(), InsertedOn = DateTime.Now, InsUser = employee?.ToString(), IsCreatedInMobileClient = true @@ -3351,6 +3351,9 @@ namespace BeWoPlanerMobil.Controllers return Logout(); } + TempData[TempDataConstants.IsInTransferModeKey] = null; + TempData[TempDataConstants.AppointmentListItemKey] = null; + try { var isInMultiBookingMode = "true,false" == formCollection[FormCollectionConstants.IsInMultiBookingModeKey]; diff --git a/BeWoPlanerMobil/Controllers/SchedulerController.cs b/BeWoPlanerMobil/Controllers/SchedulerController.cs index 806464eb6..bbcaa89e2 100644 --- a/BeWoPlanerMobil/Controllers/SchedulerController.cs +++ b/BeWoPlanerMobil/Controllers/SchedulerController.cs @@ -219,20 +219,20 @@ namespace BeWoPlanerMobil.Controllers { AllDay = appointment.AllDay, CustomerList = appointment.CustomerList, - Description = appointment.Description, + Description = appointment.Description?.RemoveUppercaseEsszett(), EmployeeList = appointment.EmployeeList, EndDate = app.Start.AddMinutes(duration), FormerBookingSequenceOid = appointment.FormerBookingSequenceOid, IsPrivate = appointment.IsPrivate, LabelKey = appointment.LabelKey, - Location = appointment.Location, + Location = appointment.Location?.RemoveUppercaseEsszett(), Originator = appointment.Originator, RecurrenceInfo = app.RecurrenceInfo.ToXml(), RecurrenceIndex = index, ReminderInfo = appointment.ReminderInfo, ResourceList = appointment.ResourceList, StartDate = app.Start, - Subject = appointment.Subject ?? "", + Subject = appointment.Subject?.RemoveUppercaseEsszett() ?? "", Type = (int) app.Type, ServiceRecordList = appointment.ServiceRecordList, SupportConceptList = appointment.SupportConceptList @@ -271,6 +271,10 @@ namespace BeWoPlanerMobil.Controllers var location = formCollection[FormCollectionConstants.AppointmentLocationKey]; var notice = formCollection[FormCollectionConstants.AppointmentNoticeKey]; + subject = subject.RemoveUppercaseEsszett(); + location = location.RemoveUppercaseEsszett(); + notice = notice.RemoveUppercaseEsszett(); + var isPrivate = formCollection[FormCollectionConstants.AppointmentIsPrivateKey] == "true,false"; var allDay = formCollection[FormCollectionConstants.AppointmentIsAllDayKey] == "true,false"; @@ -325,6 +329,7 @@ namespace BeWoPlanerMobil.Controllers appointmentToInsert.CustomerList = Model.SelectedCustomers; appointmentToInsert.ResourceList = Model.SelectedResources ?? new List(); appointmentToInsert.SupportConceptList = isNew ? new List() : appointmentToInsert.SupportConceptList; + appointmentToInsert.ServiceRecordList = isNew ? new List() : appointmentToInsert.ServiceRecordList; appointmentToInsert.EndDate = endDate; appointmentToInsert.StartDate = startDate; appointmentToInsert.Subject = subject; @@ -1045,7 +1050,7 @@ namespace BeWoPlanerMobil.Controllers CompletedNotice = schedulerAppointment.CompletedNotice, CompletedUser = schedulerAppointment.CompletedUser, CustomerList = schedulerAppointment.CustomerList ?? new List(), - Description = schedulerAppointment.Description, + Description = schedulerAppointment.Description?.RemoveUppercaseEsszett(), DueDate = schedulerAppointment.DueDate, FormerBookingSequenceOid = schedulerAppointment.FormerBookingSequenceOid, FormerTaskOid = schedulerAppointment.FormerTaskOid, @@ -1054,13 +1059,13 @@ namespace BeWoPlanerMobil.Controllers IsTask = schedulerAppointment.IsTask, IsTeilnahmeBestaetigung = schedulerAppointment.IsTeilnahmeBestaetigung, LabelKey = schedulerAppointment.LabelKey, - Location = schedulerAppointment.Location, + Location = schedulerAppointment.Location?.RemoveUppercaseEsszett(), Originator = schedulerAppointment.Originator, RecurrenceInfo = recurrenceInfo, ReminderInfo = schedulerAppointment.ReminderInfo, ResourceList = schedulerAppointment.ResourceList ?? new List(), Status = schedulerAppointment.Status, - Subject = schedulerAppointment.Subject, + Subject = schedulerAppointment.Subject?.RemoveUppercaseEsszett() ?? string.Empty, SupportConceptList = schedulerAppointment.SupportConceptList ?? new List(), TaskDescription = schedulerAppointment.TaskDescription, Type = type diff --git a/BeWoPlanerMobil/Util/AppointmentListItem.cs b/BeWoPlanerMobil/Util/AppointmentListItem.cs index efd22dedc..697eda3f5 100644 --- a/BeWoPlanerMobil/Util/AppointmentListItem.cs +++ b/BeWoPlanerMobil/Util/AppointmentListItem.cs @@ -65,7 +65,7 @@ namespace BeWoPlanerMobil.Util public bool HasEmployeesCustomersOrResources => !string.IsNullOrWhiteSpace(EmployeeListInfo + CustomerListInfo + ResourceListInfo); public bool AllDay { get; } - public bool HasServiceRecord => SchedulerAppointment?.ServiceRecordList?.Any() ?? false; + public bool HasServiceRecord => (SchedulerAppointment?.ServiceRecordList?.Any() ?? false) || (SchedulerAppointment?.HasServiceRecordEntry ?? false); public string Subject { get; } diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 91ca236e7..48a01c1d2 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -11,8 +11,13 @@ - - @**@ + + @@ -23,24 +28,19 @@ - - - - - - + - + - + @@ -67,7 +67,7 @@ - + @Html.DevExpress().GetStyleSheets( new StyleSheet { ExtensionSuite = ExtensionSuite.Report } ) @@ -251,8 +251,6 @@ } } - @Styles.Render("~/Content/DevExtremeBundle") - @Scripts.Render("~/Scripts/DevExtremeBundle") @@ -280,17 +278,17 @@