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

MoK:

Browse Source 
Korrekte Costbearer2SupportConceptOid wird in der Gruppenbuchung ausgewählt
This commit is contained in:
Lyndon Jetten
2023-01-18 17:13:42 +01:00
parent e65e47c9bb
commit a94d24392e
4 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
View File

@@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<ProjectView>ShowAllFiles</ProjectView>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>

12
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -1108,10 +1108,14 @@ namespace BeWoPlanerMobil.Controllers
{
var employeeCount = Model.GroupBookingSelectedEmployees.Count;
var personCount = Model.GroupBookingSelectedSupportConcepts.Count;
var cb2ScOids = (from scDc in Model.GroupBookingSelectedSupportConcepts
where scDc.CostBearerRelations != null && scDc.CostBearerRelations.Count > 0 let costBearer2SupportConceptOid = scDc.CostBearerRelations[0].CostBearer2SupportConceptOid
where costBearer2SupportConceptOid != null select costBearer2SupportConceptOid.Value).ToList();
// ToDo: Genaue Oid raussuchen! Bisher wird immer nur die erste genommen!
//var cb2ScOids = (from scDc in Model.GroupBookingSelectedSupportConcepts
// where scDc.CostBearerRelations != null && scDc.CostBearerRelations.Count > 0 let costBearer2SupportConceptOid = scDc.CostBearerRelations[0].CostBearer2SupportConceptOid
// where costBearer2SupportConceptOid != null select costBearer2SupportConceptOid.Value).ToList();
var cb2ScOids = Model.GroupBookingSelectedCostbearerRelOids;
var list = CalculateGroupBookingDuration(employeeCount, personCount, cb2ScOids);

32
BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml
View File

@@ -1,6 +1,32 @@
@using BeWoPlanerMobil.Util.ReportUtils
@model BeWoPlanerMobil.Models.ReportModel
<script>
function deleteCustomerSignatures(cardBodyId, resultIdentifier, customerName, timeSpan) {
try {
cardHeaderButtonClick(cardBodyId);
showMessagePopupWithCallback("Unterschriften löschen", "Sind Sie sicher, die Unterschriften von " + customerName + " im Zeitraum von " + timeSpan + " zu löschen?", function () {
}, false);
} catch(error) {
logError(error);
}
}
function deleteEmployeeSignature(cardBodyId, resultIdentifier, employeeName, customerName, timeSpan) {
try {
cardHeaderButtonClick(cardBodyId);
showMessagePopupWithCallback("Unterschrift löschen", "Sind Sie sicher, die Unterschrift von " + employeeName + " für " + customerName + " im Zeitraum von " + timeSpan + " zu löschen?", function () {
}, false);
} catch(error) {
logError(error);
}
}
</script>
<div class="mt-3">
<div class="alert alert-primary d-none" role="alert" id="warning-message-container">
@@ -132,7 +158,7 @@
-->
@* Todo: Löschfunktionen implementieren *@
@* Todo: Löschfunktionen implementieren (in Formulare umbauen!) *@
<div class="row">
<div class="col-sm-auto mr-auto">
<div class="input-group">
@@ -147,7 +173,7 @@
<div class="col-sm-auto">
<div class="btn-toolbar justify-content-between">
<div class="btn-group pr-1" role="group">
@*<button class="btn btn-danger" type="button" onclick="deleteCustomerSignatures('#collapse-result-@result.Identifier')">
@*<button class="btn btn-danger" type="button" onclick="deleteCustomerSignatures('#collapse-result-@result.Identifier', '@result.Identifier', '@result.CustomerName', '@timeSpan_ssp')">
<span class="fas fa-trash"></span>
</button>*@
<button class="btn btn-bewo-customers" type="button" onclick="@methodName">
@@ -157,7 +183,7 @@
</button>
</div>
<div class="btn-group" role="group">
@*<button class="btn btn-danger" type="button" onclick="deleteEmployeeSignature('#collapse-result-@result.Identifier')">
@*<button class="btn btn-danger" type="button" onclick="deleteEmployeeSignature('#collapse-result-@result.Identifier', '@result.Identifier', '@employeeName', '@result.CustomerName', '@timeSpan_ssp')">
<span class="fas fa-trash"></span>
</button>*@
<button class="btn btn-bewo-employee" type="button" onclick="@employeeMethodName">

26
BeWoPlanerMobil/Views/Report/Report.cshtml
View File

@@ -159,31 +159,7 @@
}
}
function deleteCustomerSignatures(cardBodyId) {
try {
cardHeaderButtonClick(cardBodyId);
// ToDo: Nachfragen, ob die Unterschriften wirklich gelöscht werden sollen
showMessagePopupWithCallback("Unterschriften löschen", "", function() {
}, false);
} catch (error) {
logError(error);
}
}
function deleteEmployeeSignature(cardBodyId) {
try {
cardHeaderButtonClick(cardBodyId);
// ToDo: Nachfragen, ob die Unterschrift wirklich gelöscht werden soll
showMessagePopupWithCallback("Unterschrift löschen", "", function () {
}, false);
} catch(error) {
logError(error);
}
}
</script>
<div class="container-fluid my-3" id="report-form-container">