ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MoK: Alias der Klienten hinzugefügt

Browse Source
This commit is contained in:
Lyndon Jetten
2023-12-21 19:08:53 +01:00
parent dc69e71465
commit 5c1512828c
10 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -5117,7 +5117,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<UseIIS>True</UseIIS>
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>8808</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>

6
BeWoPlanerMobil/Controllers/CustomerController.cs
View File

@@ -298,6 +298,7 @@ namespace BeWoPlanerMobil.Controllers
var firstname = formCollection["vorname"]?.RemoveUppercaseEsszett();
var lastname = formCollection["nachname"]?.RemoveUppercaseEsszett();
var alias = formCollection["alias"]?.RemoveUppercaseEsszett();
var geburtdatum = formCollection["geburtstag"]?.RemoveUppercaseEsszett();
var geschlecht = formCollection["geschlecht"]?.RemoveUppercaseEsszett();
@@ -325,8 +326,9 @@ namespace BeWoPlanerMobil.Controllers
return RedirectToActionPermanent("Customer");
}
customer.FirstName = firstname;
customer.LastName = lastname;
customer.FirstName = firstname;
customer.LastName = lastname;
customer.CustomerAlias = alias;
if(DateTime.TryParse(geburtdatum, out var dateOfBirth))
{

2
BeWoPlanerMobil/Models/CustomerModel.cs
View File

@@ -28,7 +28,7 @@ namespace BeWoPlanerMobil.Models
get
{
var result = new List<SelectListItem> { new SelectListItem { Value = "-1", Text = string.Empty } };
result.AddRange(Customers.Select(item => new SelectListItem { Value = item.CustomerOid.ToString(), Text = string.Format("{1}, {0}", item.FirstName, item.LastName) }).ToList());
result.AddRange(Customers.Select(item => new SelectListItem { Value = item.CustomerOid.ToString(), Text = item.SimpleDescription }).ToList());
return result;
}

9
BeWoPlanerMobil/Models/MainModel.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Diagnostics;
using System.Linq;
using System.Web.Mvc;
using BeWo.View.Navigation.Filter;
@@ -248,7 +247,7 @@ namespace BeWoPlanerMobil.Models
{
allCostBearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now.Date).Select(
cb => new SupportConceptListObject(
$"{sc.Customer.LastNameFirstName} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}",
cb.CostBearer2SupportConceptOid.ToString(),
cb.SupportConcept.IsAboutToExpire,
@@ -299,9 +298,9 @@ namespace BeWoPlanerMobil.Models
foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
{
allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate == null || w.EndDate.Value >= DateTime.Now).Select(
allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now).Select(
cb => new SupportConceptListObject(
$"{sc.Customer.LastNameFirstName} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}",
cb.CostBearer2SupportConceptOid.ToString(),
cb.SupportConcept.IsAboutToExpire,
@@ -712,7 +711,7 @@ namespace BeWoPlanerMobil.Models
{
allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate == null || w.EndDate.Value >= DateTime.Now).Select(
cb => new SupportConceptListObject(
$"{sc.Customer.LastNameFirstName} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
$"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}",
cb.CostBearer2SupportConceptOid.ToString(),
cb.SupportConcept.IsAboutToExpire,

2
BeWoPlanerMobil/Util/AppointmentListItem.cs
View File

@@ -171,7 +171,7 @@ namespace BeWoPlanerMobil.Util
schedulerAppointment.EmployeeList.DoForEach(employee2Appointment => { EmployeeListInfo += $"{employee2Appointment.Employee.LastName}, {employee2Appointment.Employee.FirstName}; "; });
EmployeeListInfo = EmployeeListInfo.Trim(' ').Trim(';');
schedulerAppointment.CustomerList.DoForEach(customer2Appointment => { CustomerListInfo += $"{customer2Appointment.LastNameFirstName}; "; });
schedulerAppointment.CustomerList.DoForEach(customer2Appointment => { CustomerListInfo += $"{customer2Appointment.SimpleDescription}; "; });
CustomerListInfo = CustomerListInfo.Trim(' ').Trim(';');
schedulerAppointment.ResourceList.DoForEach(resource => { ResourceListInfo += $"{resource.Name}; "; });

3
BeWoPlanerMobil/Util/JsonCustomer.cs
View File

@@ -14,6 +14,8 @@ namespace BeWoPlanerMobil.Util
{
public string Vorname { get; set; }
public string Nachname { get; set; }
public string Alias { get; set; }
public string Geburtstag { get; set; }
public string Geschlecht { get; set; }
@@ -117,6 +119,7 @@ namespace BeWoPlanerMobil.Util
ICD10Diagnosen = icd10Diagnosen;
Vorname = customer.FirstName;
Nachname = customer.LastName;
Alias = customer.CustomerAlias;
Geburtstag = customer.DateOfBirth?.ToShortDateString() ?? string.Empty;
switch(customer.Sex)

12
BeWoPlanerMobil/Views/Customer/Customer.cshtml
View File

@@ -217,6 +217,18 @@
</div>
</div>
</div>
<div class="row">
<div class="form-group w-100">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text customer-prepend-text-eigenschaften">
Alias
</div>
</div>
<input @inputDisabled type="text" class="form-control" id="alias" name="alias" value="@Model.SelectedJsonCustomer.Alias" />
</div>
</div>
</div>
<div class="row">
<div class="form-group w-100">
<div class="input-group date" id="date-of-birth-picker" data-target-input="nearest">

1
BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml
View File

@@ -9,6 +9,7 @@
Label Anfangsbestand
Datumsfeld Startdatum
Datumsfeld Enddatum
Datumsfeld Stichtag
Link Kassenbuch drucken (Button mit Druckerlogo)
Tabelle "Ein- und Auszahlungen"

6
BeWoPlanerMobil/Views/Scheduler/CustomerFilteringModalContentPartial.cshtml
View File

@@ -27,10 +27,14 @@
<!-- !Suche -->
@foreach(var customer in Model.AllCustomers)
{
var customerNameWithAlias = string.IsNullOrEmpty(customer.CustomerAlias) ?
customer.DetailDescription :
$"{customer.LastName}, {customer.FirstName} ({customer.CustomerAlias})";
var checkedValue = Model.SelectedCustomersForFiltering.Contains(customer) ? "checked" : string.Empty;
<div class="custom-control custom-checkbox customer-text2">
<input type="checkbox" class="custom-control-input customer-checkbox2" id="customer-@customer.CustomerOid-checkbox2" @checkedValue onchange="selectCustomersForFiltering()" />
<label class="custom-control-label customer-name-label2" for="customer-@customer.CustomerOid-checkbox2">@customer.DetailDescription</label>
<label class="custom-control-label customer-name-label2" for="customer-@customer.CustomerOid-checkbox2">@customerNameWithAlias</label>
</div>
}

10
BeWoPlanerMobil/Views/Scheduler/FiveDaySchedulerPartial.cshtml
View File

@@ -72,7 +72,7 @@
<hr />
}
@if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
@if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
{
using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
{
@@ -168,7 +168,7 @@
<hr />
}
@if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
@if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
{
using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
{
@@ -264,7 +264,7 @@
<hr />
}
@if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
@if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
{
using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
{
@@ -360,7 +360,7 @@
<hr />
}
@if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
@if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
{
using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
{
@@ -456,7 +456,7 @@
<hr />
}
@if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
@if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
{
using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
{