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

MoK: Marker-Bug behoben.

Browse Source
This commit is contained in:
Lyndon Jetten
2025-01-22 16:42:02 +01:00
parent adece86cc0
commit 2e1457d84d
5 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

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

8
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -2336,7 +2336,9 @@ namespace BeWoPlanerMobil.Controllers
var formId = formCollection[FormCollectionConstants.FormIdKey];
var marker = formCollection[FormCollectionConstants.MarkerKey];
var markerRaw = formCollection[FormCollectionConstants.MarkerKey];
var marker = "on" == markerRaw;
var serviceDescription = formCollection[FormCollectionConstants.ServiceDescriptionKey];
var startHoursDt = ConvertTimeStringToDateTime(start);
@@ -2376,6 +2378,8 @@ namespace BeWoPlanerMobil.Controllers
checkServiceRecord = new ServiceRecordDC();
}
checkServiceRecord.ServiceRecordType = marker ? ServiceRecordTypeId.Content : ServiceRecordTypeId.DefaultActivity;
checkServiceRecord.Notice = doku1;
checkServiceRecord.Notice2 = doku2;
checkServiceRecord.Notice3 = doku3;
@@ -2735,7 +2739,7 @@ namespace BeWoPlanerMobil.Controllers
[FormCollectionConstants.DurationKey] = durationRaw,
[FormCollectionConstants.DistanceKey] = distanceRaw,
[FormCollectionConstants.BetragKey] = betragRaw,
[FormCollectionConstants.MarkerKey] = marker,
[FormCollectionConstants.MarkerKey] = markerRaw,
[FormCollectionConstants.ServiceDescriptionKey] = serviceDescription,
[FormCollectionConstants.Dokumentation1Key] = doku1,
[FormCollectionConstants.Dokumentation2Key] = doku2,

6
BeWoPlanerMobil/Scripts/ownSoft-Scripts/mobileUtils.js
View File

@@ -273,8 +273,8 @@ function cardHeaderClick2(element, callback) {
return;
}
var chevronDown = $(element).find(".fa-chevron-down");
var chevronUp = $(element).find(".fa-chevron-up");
const chevronDown = $(element).find(".fa-chevron-down");
const chevronUp = $(element).find(".fa-chevron-up");
chevronDown.removeClass("fa-chevron-down").addClass("fa-chevron-up");
@@ -286,7 +286,7 @@ function cardHeaderClick2(element, callback) {
callback();
}
} catch (error) {
showErrorPopup(error);
window.showErrorPopup(error);
}
}

32
BeWoPlanerMobil/Views/Main/Main.cshtml
View File

@@ -25,6 +25,30 @@
}
<script type="text/javascript">
function loadServiceRecords() {
try {
const selectedOption = $("#timeFrameSelect").val();
const start = $("#time-frame-start-date").val();
const end = $("#time-frame-end-date").val();
const dayCount = $("#day-count-number").val();
const year = $("#year-select").val();
const month = $("#month-select").val();
if(areUndefinedOrNull([dayCount, start, end, month, year, selectedOption])) {
return;
}
showSpinner();
$("#service-record-list-container").load("@Url.Action("LoadServiceRecordsNonPost")", {dayCountNumber: dayCount, start: start, end: end, month: parseInt(month), year: parseInt(year), recordsKey: parseInt(selectedOption)},
() => {
hideSpinner();
});
} catch (error) {
window.showErrorPopup(error);
}
}
function validatePasswordStrength() {
try {
(new MoKPasswordSecurity("pw-strength-feedback")).validatePassword($("#new-password").val());
@@ -441,6 +465,10 @@
function getGetSignatureImageUrl() {
return "@Url.Action("GetSignatureImage")";
}
function reloadServiceRecordsAfterValidation() {
}
</script>
<div class="container mt-3 lg-max-width" id="checkbox-container">
@@ -794,10 +822,10 @@
}
else
{
<button type="button" class="btn btn-primary" data-dismiss="modal">OK</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" onclick="loadServiceRecords()">OK</button>
}
<button type="button" class="btn btn-secondary" data-dismiss="modal">Schließen</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="loadServiceRecords()">Schließen</button>
</div>
</div>
</div>

26
BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml
View File

@@ -103,30 +103,6 @@
}
}
function loadServiceRecords() {
try {
const selectedOption = $("#timeFrameSelect").val();
const start = $("#time-frame-start-date").val();
const end = $("#time-frame-end-date").val();
const dayCount = $("#day-count-number").val();
const year = $("#year-select").val();
const month = $("#month-select").val();
if(areUndefinedOrNull([dayCount, start, end, month, year, selectedOption])) {
return;
}
showSpinner();
$("#service-record-list-container").load("@Url.Action("LoadServiceRecordsNonPost")", {dayCountNumber: dayCount, start: start, end: end, month: parseInt(month), year: parseInt(year), recordsKey: parseInt(selectedOption)},
() => {
hideSpinner();
});
} catch (error) {
window.showErrorPopup(error);
}
}
function initializeIntervalSelection() {
try {
const selectedOption = $("#timeFrameSelect option:selected").val();
@@ -304,7 +280,7 @@
<div class="form-row">
<div class="col-md">
<div class="mt-3" id="single-booking-employee-container">
@Html.PopupWithSearchForIFilterables(Model.AllEmployees, "setSelectedEmployeeForSingleBooking", null, Model.SelectedEmployee?.DetailDescription, "single-booking-employee-modal-popup")
@Html.PopupWithSearchForIFilterables(Model.Employees, "setSelectedEmployeeForSingleBooking", null, Model.SelectedEmployee?.DetailDescription, "single-booking-employee-modal-popup")
</div>
</div>
</div>