Fehler behoben und QuittierungsbelegsResultPartial.cshtml hinzugefügt
This commit is contained in:
@@ -287,7 +287,7 @@ namespace BeWoPlanerMobil.Models
|
||||
|
||||
public SupportConceptListObject SelectedSupportConceptListObject { get; set; }
|
||||
|
||||
public List<SupportConceptCostBearerRelDC> SelectedConceptCostBearerRelations { get; set; } = new List<SupportConceptCostBearerRelDC>();
|
||||
public List<SupportConceptCostBearerRelDC> SelectedConceptCostBearerRelations { get; set; }
|
||||
|
||||
public GroupBookingSelectionObject GroupBookingSelectionObject => new GroupBookingSelectionObject(SelectedConceptCostBearerRelations, GroupBookingSelectedGroupOfPeopleOids);
|
||||
|
||||
@@ -676,7 +676,7 @@ namespace BeWoPlanerMobil.Models
|
||||
|
||||
public List<long> MultiBookingSelectedGroupOfPeopleOids { get; set; } = new List<long>();
|
||||
|
||||
public List<SupportConceptCostBearerRelDC> MultiBookingSelectedConceptCostBearerRelations { get; set; } = new List<SupportConceptCostBearerRelDC>();
|
||||
public List<SupportConceptCostBearerRelDC> MultiBookingSelectedConceptCostBearerRelations { get; set; };
|
||||
|
||||
public GroupBookingSelectionObject MultiBookingSelectionObject => new GroupBookingSelectionObject(MultiBookingSelectedConceptCostBearerRelations, MultiBookingSelectedGroupOfPeopleOids);
|
||||
|
||||
|
||||
@@ -0,0 +1,207 @@
|
||||
@using BeWoPlanerMobil.Util.ReportUtils
|
||||
@model BeWoPlanerMobil.Models.ReportModel
|
||||
|
||||
<div class="mt-3">
|
||||
<div class="alert alert-primary d-none" role="alert" id="warning-message-container">
|
||||
|
||||
</div>
|
||||
@if(TempData["HasWarningMessage"] != null)
|
||||
{
|
||||
<div class="alert alert-primary" role="alert">
|
||||
Es wurden keine auswertbaren Einträge gefunden
|
||||
</div>
|
||||
}
|
||||
else if(Model?.ConfirmationReceiptObject?.ConfirmationReceiptResultList?.Count > 0)
|
||||
{
|
||||
<div class="alert alert-info" role="alert">
|
||||
@Model.ConfirmationReceiptObject.Information
|
||||
</div>
|
||||
|
||||
<input type="hidden" id="service-record-count" value="@Model.ConfirmationReceiptObject.NumberOfServiceRecords" />
|
||||
<input type="hidden" id="signature-canvas-information" value="@Model.ConfirmationReceiptObject.SignatureCanvasInformation" />
|
||||
|
||||
foreach(var result in Model.ConfirmationReceiptObject.ConfirmationReceiptResultList)
|
||||
{
|
||||
<div class="card w-100 mb-3">
|
||||
<div class="card-header" onclick="cardHeaderClick('#chevron-@result.Identifier', '#collapse-result-@result.Identifier')">
|
||||
@{
|
||||
var customerSignatureOidsString = "";
|
||||
|
||||
foreach(var signatureOid in result.CustomerSignatureOids)
|
||||
{
|
||||
customerSignatureOidsString += signatureOid + ",";
|
||||
}
|
||||
|
||||
var employeeSignatureOidsString = "";
|
||||
|
||||
foreach(var employeeSignatureOid in result.EmployeeSignatureOids)
|
||||
{
|
||||
employeeSignatureOidsString += employeeSignatureOid + ",";
|
||||
}
|
||||
|
||||
var employeeSignatureState = result.EmployeeSignatureState;
|
||||
var customerSignatureState = result.CustomerSignatureState;
|
||||
|
||||
var canCustomerSign = customerSignatureState != SignatureState.All;
|
||||
var canEmployeeSign = employeeSignatureState != SignatureState.All;
|
||||
|
||||
var employeeName = Model.Employee.ToString();
|
||||
|
||||
//overwrite, signatureOidsString, canSign, cardBodyId, customerOid, numberOfEntries, customerName, timeSpan, isEmployeeSignature
|
||||
var methodName = "showSignaturePad(" +
|
||||
$"{result.HasCustomerSignature.ToString().ToLower()}, " +
|
||||
$"'{customerSignatureOidsString}', " +
|
||||
$"{canCustomerSign.ToString().ToLower()}, " +
|
||||
$"'#collapse-result-{result.Identifier}', " +
|
||||
$"{result.CustomerOid}, " +
|
||||
$"{result.Items.Count}, " +
|
||||
$"'{result.CustomerName}', " +
|
||||
$"'{Model.ConfirmationReceiptObject.TimeSpanString}', " +
|
||||
"false, " +
|
||||
$"'{employeeName}')";
|
||||
|
||||
//overwrite, signatureOidsString, canSign, cardBodyId, customerOid, numberOfEntries, customerName, timeSpan, isEmployeeSignature
|
||||
var overwrite_ssp = (employeeSignatureState == SignatureState.All).ToString().ToLower();
|
||||
var signatureOidsString_ssp = employeeSignatureOidsString;
|
||||
var canSign_ssp = canEmployeeSign.ToString().ToLower();
|
||||
var cardBodyId_ssp = $"#collapse-result-{result.Identifier}";
|
||||
var numberOfEntries_ssp = result.Items.Count;
|
||||
var customerOid_ssp = result.CustomerOid;
|
||||
var customerName_ssp = result.CustomerName;
|
||||
var timeSpan_ssp = Model.ConfirmationReceiptObject.TimeSpanString;
|
||||
|
||||
|
||||
|
||||
var employeeMethodName = $"showSignaturePad({overwrite_ssp}, '{signatureOidsString_ssp}', {canSign_ssp}, '{cardBodyId_ssp}', {customerOid_ssp}, {numberOfEntries_ssp}, '{customerName_ssp}', '{timeSpan_ssp}', true, '{employeeName}')";
|
||||
|
||||
var employeeBtnColor = "transparent";
|
||||
var customerBtnColor = "transparent";
|
||||
var employeeIcon = "check";
|
||||
var customerIcon = "check";
|
||||
|
||||
switch(employeeSignatureState)
|
||||
{
|
||||
case SignatureState.All:
|
||||
employeeBtnColor = "greenyellow";
|
||||
employeeIcon = "check-double";
|
||||
break;
|
||||
case SignatureState.Some:
|
||||
employeeBtnColor = "yellow";
|
||||
break;
|
||||
case SignatureState.None:
|
||||
employeeBtnColor = "transparent";
|
||||
break;
|
||||
}
|
||||
|
||||
switch(customerSignatureState)
|
||||
{
|
||||
case SignatureState.All:
|
||||
customerBtnColor = "greenyellow";
|
||||
customerIcon = "check-double";
|
||||
break;
|
||||
case SignatureState.Some:
|
||||
customerBtnColor = "yellow";
|
||||
break;
|
||||
case SignatureState.None:
|
||||
customerBtnColor = "transparent";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend">
|
||||
<i class="fas fa-chevron-down h-100 text-primary" id="chevron-@result.Identifier"></i>
|
||||
</div>
|
||||
<p class="form-control text-primary border-0 bg-transparent" style="user-select: none !important;">
|
||||
@result.CustomerName
|
||||
</p>
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-bewo-customers rounded mr-1" type="button" onclick="@methodName">
|
||||
<span class="fas fa-signature"></span>
|
||||
<span class="fas fa-@customerIcon" style="color: @customerBtnColor !important"></span>
|
||||
K
|
||||
</button>
|
||||
<button class="btn btn-bewo-employee rounded" type="button" onclick="@employeeMethodName">
|
||||
<span class="fas fa-signature"></span>
|
||||
<span class="fas fa-@employeeIcon" style="color: @employeeBtnColor !important"></span>
|
||||
M
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="collapse" id="collapse-result-@result.Identifier">
|
||||
<div class="card-body mx-0 px-0">
|
||||
<div class="container-fluid">
|
||||
@foreach(var item in result.Items)
|
||||
{
|
||||
<div class="card w-100 mb-3">
|
||||
<div class="card-header" onclick="cardHeaderClick('#chevron-@item.Identifier', '#collapse-item-@item.Identifier')">
|
||||
<div class="d-inline-flex">
|
||||
<i class="fas fa-chevron-down h-100 text-primary" id="chevron-@item.Identifier"></i>
|
||||
</div>
|
||||
<div class="p2 d-inline-flex text-primary h-100">
|
||||
<button type="button" class="btn btn-link">
|
||||
@item.DateTimeString
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@{
|
||||
var hasEmployeeSignatureTextColorClass = item.HasEmployeeSignature ? "text-bewo-employee" : "text-light";
|
||||
}
|
||||
|
||||
<span class="fas fa-check h-100 @hasEmployeeSignatureTextColorClass float-right pt-2"></span>
|
||||
|
||||
<span class="float-right pt-2 text-light">m</span>
|
||||
|
||||
@if(item.HasCustomerSignature)
|
||||
{
|
||||
<span class="fas fa-check h-100 text-bewo-customers float-right pt-2"></span>
|
||||
}
|
||||
</div>
|
||||
<div class="collapse" id="collapse-item-@item.Identifier">
|
||||
<div class="card-body">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col text-secondary">
|
||||
Kontaktart:
|
||||
</div>
|
||||
<div class="col">
|
||||
@item.Kontaktart
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col text-secondary">
|
||||
Anzahl Klienten:
|
||||
</div>
|
||||
<div class="col">
|
||||
@item.CustomersCount
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col text-secondary">
|
||||
FLS in Minuten (ohne 1,2):
|
||||
</div>
|
||||
<div class="col">
|
||||
@item.Minutes
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col text-secondary">
|
||||
Mitarbeiter:
|
||||
</div>
|
||||
<div class="col">
|
||||
@item.Employees
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
Reference in New Issue
Block a user