MoK: Höhe der Unterschriftenfelder im Quittierungsbelegsteil an die der Felder in der Zeiterfassung angepasst.
This commit is contained in:
@@ -568,8 +568,6 @@ namespace BeWoPlanerMobil.Controllers
|
||||
[Authorize]
|
||||
public ActionResult PrintBargeldkasse(long kassenbuchOid, string reportStartDate, string reportEndDate)
|
||||
{
|
||||
// Benötigt werden: BargeldkassenOid, Startdatum und Enddatum
|
||||
|
||||
var bargeldkasse = Model.Bargeldkassen.FirstOrDefault(f => f.BargeldkassenOid.HasValue && f.BargeldkassenOid.Value.Equals(kassenbuchOid));
|
||||
|
||||
var startDate = DateTime.TryParse(reportStartDate, out var parsedStartDate) ? parsedStartDate : DateTime.Today.GetFirstOfMonth();
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
@using BeWoPlanerMobil.Models
|
||||
@using BS.Shared
|
||||
@using BS.Shared.Extensions
|
||||
@model BeWoPlanerMobil.Models.CustomerModel
|
||||
|
||||
|
||||
@@ -79,8 +80,10 @@
|
||||
|
||||
function editBtnClickTest(bargeldkassenOid, bargeldkassenname) {
|
||||
try {
|
||||
showSpinner();
|
||||
event.stopPropagation();
|
||||
$("#customer-bargeldkassen-modal-body").load("@Url.Action("LoadEditFormPartial")", { bargeldkassenOid: bargeldkassenOid }, function() {
|
||||
$("#customer-bargeldkassen-modal-body").load("@Url.Action("LoadEditFormPartial")", {bargeldkassenOid: bargeldkassenOid}, function () {
|
||||
hideSpinner();
|
||||
$("#customer-bargeldkassen-form-popup-title").text(bargeldkassenname + " bearbeiten");
|
||||
$("#customer-bargeldkassen-form-popup").modal("show");
|
||||
calcBargeldkassenFormPrependWidth();
|
||||
@@ -106,8 +109,10 @@
|
||||
|
||||
function addNewBargeldkasse() {
|
||||
try {
|
||||
showSpinner();
|
||||
$("#customer-bargeldkassen-modal-body").load("@Url.Action("LoadFormPartial")",
|
||||
function () {
|
||||
hideSpinner();
|
||||
$("#customer-bargeldkassen-form-popup-title").text("Bargeldkasse hinzufügen");
|
||||
$("#customer-bargeldkassen-form-popup").modal("show");
|
||||
calcBargeldkassenFormPrependWidth();
|
||||
@@ -119,17 +124,8 @@
|
||||
|
||||
function previewBargeldkassenReport(bargeldkassenOid) {
|
||||
try {
|
||||
@*showSpinner();
|
||||
$("#msk-form-col").load("@Url.Action("LoadViewerForm")", { reportType: selectedReportType }, function () {
|
||||
toggleMitarbeiterstundenForm();
|
||||
hideSpinner();
|
||||
});*@
|
||||
|
||||
//var start = $("").val();
|
||||
//var end = $("").val();
|
||||
|
||||
var start = "01.01.2024";
|
||||
var end = "31.01.2024";
|
||||
var start = $("#customer-bargeldkasse-start-date-" + bargeldkassenOid).val();
|
||||
var end = $("#customer-bargeldkasse-end-date-" + bargeldkassenOid).val();
|
||||
|
||||
$("#customer-bargeldkassen-report-modal-body").load("@Url.Action("PrintBargeldkasse")", {bargeldkassenOid: bargeldkassenOid, reportStartDate: start, reportEndDate: end}, function() {
|
||||
$("#customer-bargeldkassen-report-popup").modal("show");
|
||||
@@ -139,6 +135,45 @@
|
||||
showErrorPopup(error);
|
||||
}
|
||||
}
|
||||
|
||||
$(window).on("load", function () {
|
||||
calculateDateInputWidth();
|
||||
});
|
||||
|
||||
var initialDateInputWidth = 0;
|
||||
function calculateDateInputWidth() {
|
||||
try {
|
||||
var bargeldkassenDateInputMaxWidth = getMaxWidth("customer-bargeldkassen-date-prepend");
|
||||
|
||||
if(initialDateInputWidth <= 0 && $.isNumeric(bargeldkassenDateInputMaxWidth)) {
|
||||
initialDateInputWidth = bargeldkassenDateInputMaxWidth;
|
||||
}
|
||||
|
||||
if (initialDateInputWidth <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
$(".customer-bargeldkassen-date-prepend").width(bargeldkassenDateInputMaxWidth);
|
||||
} catch(error) {
|
||||
showErrorPopup(error);
|
||||
}
|
||||
}
|
||||
|
||||
function deleteBargeldransaktion(transaktionsOid) {
|
||||
try {
|
||||
|
||||
} catch(error) {
|
||||
showErrorPopup(error);
|
||||
}
|
||||
}
|
||||
|
||||
function downloadZahlungsbeleg(transaktionsOid) {
|
||||
try {
|
||||
|
||||
} catch(error) {
|
||||
showErrorPopup(error);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="row mx-0 px-0">
|
||||
@@ -153,7 +188,7 @@
|
||||
{
|
||||
<div class="col mb-3 mx-0 px-1">
|
||||
<div class="card h-100">
|
||||
<div class="card-header" onclick="cardHeaderClick2(this)">
|
||||
<div class="card-header" onclick="cardHeaderClick2(this, calculateDateInputWidth)">
|
||||
<div class="d-inline-flex">
|
||||
<i class="fas fa-chevron-down h-100 text-bewo-customer-card-header chevron-identifier-class"></i>
|
||||
</div>
|
||||
@@ -171,6 +206,9 @@
|
||||
var auszahlungen = bargeldkasse.Bargeldtransaktionen.Where(bkt => bkt.Zahlungstyp == Zahlungstyp.Auszahlung).Sum(bkt => bkt.Betrag) ?? 0m;
|
||||
|
||||
var kassenbestand = ((bargeldkasse.Anfangsbestand ?? 0m) + einzahlungen - auszahlungen).ToString("0.00 €");
|
||||
|
||||
var startDate = DateTime.Today.GetFirstOfMonth().ToString("dd.MM.yyyy");
|
||||
var endDate = DateTime.Today.GetLastOfMonth().ToString("dd.MM.yyyy");
|
||||
}
|
||||
|
||||
<div class="row">
|
||||
@@ -192,19 +230,23 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@*
|
||||
----- Startdatum -----
|
||||
<div class="form-row">
|
||||
<div class="col-md">
|
||||
<div class="form-group mb-1">
|
||||
|
||||
@*----- Startdatum, Enddatum und Stichtag -----*@
|
||||
<div class="form-row mt-2">
|
||||
<div class="col">
|
||||
<div class="form-group mb-0">
|
||||
<div class="input-group date ownSoft-date-picker" id="customer-bargeldkasse-start-date-picker" data-target-input="nearest">
|
||||
<div class="input-group-prepend">
|
||||
<div class="input-group-text customer-bargeldkassen-prepend">
|
||||
<div class="input-group-text customer-bargeldkassen-date-prepend">
|
||||
Startdatum
|
||||
</div>
|
||||
</div>
|
||||
<input type="text" value="@startDate" id="customer-bargeldkasse-start-date" name="customer-bargeldkasse-start-date" class="form-control datetimepicker-input" data-target="#customer-absence-time-end-date-picker" data-toggle="datetimepicker" />
|
||||
<div class="input-group-append" data-target="#customer-bargeldkasse-start-date-picker" data-toggle="datetimepicker">
|
||||
<input type="text" value="@startDate"
|
||||
id="customer-bargeldkasse-start-date-@bargeldkasse.BargeldkassenOid"
|
||||
name="customer-bargeldkasse-start-date"
|
||||
class="form-control datetimepicker-input"
|
||||
data-target="#customer-bargeldkasse-start-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker" />
|
||||
<div class="input-group-append" data-target="#customer-bargeldkasse-start-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker">
|
||||
<div class="input-group-text px-2">
|
||||
<i class="fas fa-calendar-alt"></i>
|
||||
</div>
|
||||
@@ -213,19 +255,37 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
----- Enddatum -----
|
||||
<div class="form-row">
|
||||
<div class="col-md">
|
||||
<div class="form-group mb-1">
|
||||
<div class="input-group date ownSoft-date-picker" id="customer-bargeldkasse-end-date-picker" data-target-input="nearest">
|
||||
<div class="form-row mt-1">
|
||||
<div class="col">
|
||||
<div class="form-group mb-0">
|
||||
<div class="input-group date ownSoft-date-picker" id="customer-bargeldkasse-end-date-picker-@bargeldkasse.BargeldkassenOid" data-target-input="nearest">
|
||||
<div class="input-group-prepend">
|
||||
<div class="input-group-text customer-bargeldkassen-prepend">
|
||||
<div class="input-group-text customer-bargeldkassen-date-prepend">
|
||||
Enddatum
|
||||
</div>
|
||||
</div>
|
||||
<input type="text" value="@endDate" id="customer-bargeldkasse-end-date" name="customer-bargeldkasse-end-date" class="form-control datetimepicker-input" data-target="#customer-absence-time-end-date-picker" data-toggle="datetimepicker" />
|
||||
<div class="input-group-append" data-target="#customer-bargeldkasse-end-date-picker" data-toggle="datetimepicker">
|
||||
<input type="text" value="@endDate" id="customer-bargeldkasse-end-date-@bargeldkasse.BargeldkassenOid" name="customer-bargeldkasse-end-date" class="form-control datetimepicker-input" data-target="#customer-absence-time-end-date-picker" data-toggle="datetimepicker" />
|
||||
<div class="input-group-append" data-target="#customer-bargeldkasse-end-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker">
|
||||
<div class="input-group-text px-2">
|
||||
<i class="fas fa-calendar-alt"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@*----- Stichtag -----*@
|
||||
<div class="form-row mt-1">
|
||||
<div class="col">
|
||||
<div class="form-group mb-1">
|
||||
<div class="input-group date ownSoft-date-picker" id="customer-bargeldkasse-stichtag-date-picker-@bargeldkasse.BargeldkassenOid" data-target-input="nearest">
|
||||
<div class="input-group-prepend">
|
||||
<div class="input-group-text customer-bargeldkassen-date-prepend">
|
||||
Stichtag
|
||||
</div>
|
||||
</div>
|
||||
<input type="text" id="customer-bargeldkasse-stichtag-date-@bargeldkasse.BargeldkassenOid" name="customer-bargeldkasse-stichtag-date" class="form-control datetimepicker-input" data-target="#customer-absence-time-end-date-picker" data-toggle="datetimepicker" />
|
||||
<div class="input-group-append" data-target="#customer-bargeldkasse-stichtag-date-picker-@bargeldkasse.BargeldkassenOid" data-toggle="datetimepicker">
|
||||
<div class="input-group-text px-2">
|
||||
<i class="fas fa-calendar-alt"></i>
|
||||
</div>
|
||||
@@ -234,43 +294,125 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
*@
|
||||
<div class="w-100">
|
||||
<table class="w-100">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Kassenbestand:
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@kassenbestand
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Anfangsbestand:
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@anfangsbestand
|
||||
</td>
|
||||
</tr>
|
||||
@*<tr>
|
||||
<td class="text-secondary">
|
||||
Startdatum:
|
||||
</td>
|
||||
<td class="text-primary">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Enddatum:
|
||||
</td>
|
||||
<td class="text-primary">
|
||||
</td>
|
||||
</tr>*@
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Kassenbestand:
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@kassenbestand
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Anfangsbestand:
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@anfangsbestand
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@* Liste mit den Ein- und Auszahlungen *@
|
||||
<div class="col mb-0 pb-0 mx-0 px-0">
|
||||
<div class="card h-100">
|
||||
<div class="card-header" onclick="cardHeaderClick2(this)">
|
||||
<div class="d-inline-flex">
|
||||
<i class="fas fa-chevron-down h-100 text-bewo-customer-card-header chevron-identifier-class"></i>
|
||||
</div>
|
||||
<div class="d-inline d-inline-flex text-bewo-customer-card-header h-100">
|
||||
<p>Ein- und Auszahlungen</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="collapse">
|
||||
<div class="card-body">
|
||||
<table class="w-100 mx-0 px-0">
|
||||
<tbody>
|
||||
@{
|
||||
var count = 0;
|
||||
}
|
||||
|
||||
@foreach(var transaktion in bargeldkasse.Bargeldtransaktionen)
|
||||
{
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<div class="btn-group w-100" role="gorup">
|
||||
<button class="btn btn-outline-primary" title="Zahlungsbeleg herunterladen" type="button" onclick="downloadZahlungsbeleg(@transaktion.BargeldtransaktionOid)">
|
||||
<i class="fas fa-file-download"></i>
|
||||
</button>
|
||||
<button class="btn btn-outline-danger" title="Bargeldtransaktion löschen" type="button" onclick="deleteBargeldransaktion(@transaktion.BargeldtransaktionOid)">
|
||||
<i class="fas fa-trash-alt"></i>
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Datum
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@transaktion.Zahlungsdatum.Value.ToString("dd.MM.yyyy")
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Art
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@transaktion.Zahlungstyp
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Betrag
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@transaktion.Betrag.Value.ToString("0.00 €")
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Belegnummer
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@transaktion.Belegnummer
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Angelegt von
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@transaktion.InsUser
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-secondary">
|
||||
Notiz
|
||||
</td>
|
||||
<td class="text-primary float-right">
|
||||
@transaktion.Notice
|
||||
</td>
|
||||
</tr>
|
||||
if(count < bargeldkasse.Bargeldtransaktionen.Count - 1)
|
||||
{
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<hr/>
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
|
||||
count++;
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -285,8 +427,7 @@
|
||||
}
|
||||
|
||||
@*
|
||||
ToDos:
|
||||
1. Edit-Popup für Bargeldkasse an sich (Name + Anfangsbestand)
|
||||
ToDo:
|
||||
2. Formularpopup für Transaktionen (Datum, Art, Betrag, Belegnummer, Notiz)
|
||||
|
||||
*@
|
||||
@@ -344,7 +485,7 @@
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body" id="customer-bargeldkassen-report-modal-body">
|
||||
@Html.Partial("CustomerReportPartial", Model)
|
||||
@Html.Partial("BargeldkassenReportPartial", Model)
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
@using BeWoPlanerMobil.Models;
|
||||
@using BeWoPlanerMobil.Util
|
||||
@using BS.Shared.Extensions
|
||||
|
||||
@model CustomerModel
|
||||
|
||||
@@ -144,16 +142,7 @@
|
||||
Auszahlungsintervall
|
||||
</div>
|
||||
</div>
|
||||
@*
|
||||
@Html.DropDownListFor(model => model.SelectedReportType, Model.ReportTypes, new { @class = "custom-select", onchange = "updateForm()", id = "msk-report-type-select" })
|
||||
*@
|
||||
@Html.DropDownListFor(model => model.SelectedAuszahlungsintervall, Model.Auszahlungsintervalle, new {@class="form-control", id = "auszahlungsintervall-select-input", onchange="setAuszahlungsintervall()" })
|
||||
@*<select class="form-control" id="auszahlungsintervall-select-input">
|
||||
<option value="0" selected>Kein</option>
|
||||
<option value="1">Monatlich</option>
|
||||
<option value="2">Wöchentlich</option>
|
||||
<option value="3">Täglich</option>
|
||||
</select>*@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -176,27 +165,4 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@*----- Stichtag -----*@
|
||||
<div class="form-row">
|
||||
<div class="col-md">
|
||||
<div class="form-group mb-1">
|
||||
<div class="input-group date ownSoft-date-picker" id="customer-bargeldkasse-stichtag-date-picker" data-target-input="nearest">
|
||||
<div class="input-group-prepend">
|
||||
<div class="input-group-text customer-bargeldkassen-prepend">
|
||||
Stichtag
|
||||
</div>
|
||||
</div>
|
||||
<input type="text" id="customer-bargeldkasse-stichtag-date" name="customer-bargeldkasse-stichtag-date" class="form-control datetimepicker-input" data-target="#customer-absence-time-end-date-picker" data-toggle="datetimepicker" />
|
||||
<div class="input-group-append" data-target="#customer-bargeldkasse-stichtag-date-picker" data-toggle="datetimepicker">
|
||||
<div class="input-group-text px-2">
|
||||
<i class="fas fa-calendar-alt"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -193,7 +193,7 @@
|
||||
</div>
|
||||
<div class="row mt-3 signingContent" id="qb-sig-canvas-row">
|
||||
<div class="canvas-container" id="qb-sig-canvas-container">
|
||||
<canvas id="qb-sig-sketch-pad" width="500" heigh="200" style="border: 1px solid #343A40" class="bg-white rounded"></canvas>
|
||||
<canvas id="qb-sig-sketch-pad" width="500" height="200" style="border: 1px solid #343A40" class="bg-white rounded"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row signingContent">
|
||||
|
||||
Reference in New Issue
Block a user