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

Bug mit der System.Web.Mvc DLL gefixt.

Browse Source
This commit is contained in:
Lyndon Jetten
2025-03-28 15:44:19 +01:00
parent 24517de7fa
commit 617bcdad77
9 changed files with 212 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -181,8 +181,8 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.3.0.3\lib\net462\log4net.dll</HintPath>
<Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -210,15 +210,15 @@
<HintPath>..\packages\RestSharp.106.13.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
<Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Drawing" />
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
<Reference Include="System.Memory, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.2\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -231,15 +231,15 @@
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.1\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.2\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />

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

@@ -118,7 +118,7 @@ function hasEmptyRequiredFields(form) {
var count = 0;
form.each(function() {
var requiredElements = $(this, "input, textarea, select").find("[required]");
const requiredElements = $(this, "input, textarea, select").find("[required]");
requiredElements.each(function(index, element) {
if ($(element).val().length === 0) {
@@ -132,7 +132,7 @@ function hasEmptyRequiredFields(form) {
function showAboutPopup() {
// Auf deutsch?
var text = "SignaturePad:<br/>Copyright (c) 2018 Szymon Nowak<br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights<br/>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:<br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.<br/>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.";
const text = "SignaturePad:<br/>Copyright (c) 2018 Szymon Nowak<br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights<br/>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:<br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.<br/>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.";
$("#message-popup-ok-btn").unbind();
$("#message-popup-close-btn").unbind();
@@ -152,8 +152,8 @@ function showAboutPopup() {
}
function cloneCanvas(oldCanvas) {
var newCanvas = document.createElement("canvas");
var context = newCanvas.getContext("2d", {willReadFrequently: true});
const newCanvas = document.createElement("canvas");
const context = newCanvas.getContext("2d", {willReadFrequently: true});
newCanvas.width = oldCanvas.width;
newCanvas.height = oldCanvas.height;
@@ -237,15 +237,15 @@ function isUndefinedOrNull(obj) {
}
function areUndefinedOrNull(array) {
if (array == null) {
if(array == null) {
return true;
}
if (!Array.isArray(array)) {
if(!Array.isArray(array)) {
return true;
}
for (var i = 0; i < array.length; i++) {
for(let i = 0; i < array.length; i++) {
if(array[i] != null) {
return false;
}
@@ -255,64 +255,45 @@ function areUndefinedOrNull(array) {
}
function cardHeaderClick(chevronId, cardBodyId) {
try {
$(cardBodyId).toggle();
toggleChevron(chevronId, cardBodyId);
}
catch(error) {
showErrorPopup(error);
}
$(cardBodyId).collapse("toggle");
toggleChevron(chevronId, cardBodyId);
}
function cardHeaderClick2(element, callback) {
try {
if(element === undefined || element === null) {
console.logWarning("element is undefined or null!");
return;
}
if(element === undefined || element === null) {
console.logWarning("element is undefined or null!");
return;
}
const chevronDown = $(element).find(".fa-chevron-down");
const 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");
chevronDown.removeClass("fa-chevron-down").addClass("fa-chevron-up");
chevronUp.removeClass("fa-chevron-up").addClass("fa-chevron-down");
chevronUp.removeClass("fa-chevron-up").addClass("fa-chevron-down");
$(element).next(".collapse").collapse("toggle");
$(element).next(".collapse").collapse("toggle");
if(typeof callback === "function") {
callback();
}
} catch (error) {
window.showErrorPopup(error);
if(typeof callback === "function") {
callback();
}
}
// Muss manuell im onclick-Event des Buttons aufgerufen werden
function cardHeaderButtonClick(cardBodyId) {
try {
$(cardBodyId).toggle();
}
catch(error) {
showErrorPopup(error);
}
$(cardBodyId).collapse("toggle");
}
// ToDo: Hier am 21.08.2023 weitermachen!
function toggleChevron(chevronId, cardBodyId) {
try {
var isDown = $(cardBodyId).css("display") !== "none";
var chevron = $(chevronId);
var iconToRemove = isDown ? "fa-chevron-down" : "fa-chevron-up";
var iconToAdd = isDown ? "fa-chevron-up" : "fa-chevron-down";
const isDown = $(cardBodyId).css("display") !== "none";
const chevron = $(chevronId);
const iconToRemove = isDown ? "fa-chevron-down" : "fa-chevron-up";
const iconToAdd = isDown ? "fa-chevron-up" : "fa-chevron-down";
chevron.removeClass(iconToRemove);
chevron.addClass(iconToAdd);
} catch (error) {
showErrorPopup(error);
}
chevron.removeClass(iconToRemove);
chevron.addClass(iconToAdd);
}
function validateNonEmptyString(stringValue) {
@@ -320,108 +301,92 @@ function validateNonEmptyString(stringValue) {
}
function showCollapsable(collapsableElement) {
try {
if (collapsableElement === null || collapsableElement === undefined) {
return;
}
if(collapsableElement === null || collapsableElement === undefined) {
return;
}
if (!collapsableElement.hasClass("show")) {
collapsableElement.addClass("show");
}
} catch (error) {
showErrorPopup(error);
if(!collapsableElement.hasClass("show")) {
collapsableElement.addClass("show");
}
}
function hideCollapsable(collapsableElement) {
try {
if (collapsableElement === null || collapsableElement === undefined) {
return;
}
if (collapsableElement === null || collapsableElement === undefined) {
return;
}
if (collapsableElement.hasClass("show")) {
collapsableElement.removeClass("show");
}
} catch (error) {
showErrorPopup(error);
if (collapsableElement.hasClass("show")) {
collapsableElement.removeClass("show");
}
}
function treeSearchOnChange(searchInputId, textClass, cardClass, nameLabelClass, itemListClass) {
try {
var text = $("#" + searchInputId).val().toLowerCase();
var text = $(`#${searchInputId}`).val().toLowerCase();
var entries = $("." + textClass);
const entries = $(`.${textClass}`);
if(text.length === 0 || !text.replace(/\s\g/, '').length) {
resetTreeSearch(searchInputId, textClass, cardClass);
return;
if(text.length === 0 || !text.replace(/\s\g/, "").length) {
resetTreeSearch(searchInputId, textClass, cardClass);
return;
}
$.each(entries, function (index, entry) {
const checkbox = $(entry);
const treeCard = checkbox.closest(`.${cardClass}`);
const header = treeCard.find(".tree-card-header");
const list = treeCard.find(".collapse");
const treeItemName = checkbox.find(`.${nameLabelClass}`).text().toLowerCase();
const includesText = treeItemName.includes(text) || header.html().toLowerCase().includes(text);
if (includesText) {
checkbox.show();
treeCard.show();
showCollapsable($(list));
} else {
checkbox.hide();
}
});
const lists = $(`.${itemListClass}`);
var cardsToHide = [];
$.each(lists, function (index, item) {
const children = $(item).children();
var hasAtLeastOneVisibleChild = false;
const card = $(item).parent().parent();
for(let i = 0; i < children.length; i++) {
const child = children[i];
hasAtLeastOneVisibleChild = $(child).css("display") === "block";
if(hasAtLeastOneVisibleChild === true) {
break;
}
}
$.each(entries, function (index, entry) {
var checkbox = $(entry);
var treeCard = checkbox.closest("." + cardClass);
var header = treeCard.find(".tree-card-header");
var list = treeCard.find(".collapse");
var treeItemName = checkbox.find("." + nameLabelClass).text().toLowerCase();
var includesText = treeItemName.includes(text) || header.html().toLowerCase().includes(text);
if(hasAtLeastOneVisibleChild === false) {
cardsToHide.push(card);
}
});
if (includesText) {
checkbox.show();
treeCard.show();
showCollapsable($(list));
} else {
checkbox.hide();
}
});
var lists = $("." + itemListClass);
var cardsToHide = [];
$.each(lists, function (index, item) {
var children = $(item).children();
var hasAtLeastOneVisibleChild = false;
var card = $(item).parent().parent();
for(var i = 0; i < children.length; i++) {
var child = children[i];
hasAtLeastOneVisibleChild = $(child).css("display") === "block";
if(hasAtLeastOneVisibleChild === true) {
break;
}
}
if(hasAtLeastOneVisibleChild === false) {
cardsToHide.push(card);
}
});
$.each(cardsToHide, function (index, item) {
$(item).hide();
});
} catch (error) {
showErrorPopup(error);
}
$.each(cardsToHide, function (index, item) {
$(item).hide();
});
}
function resetTreeSearch(searchInputId, textClass, cardClass) {
try {
$("#" + searchInputId).val("");
$(`#${searchInputId}`).val("");
var entries = $("." + textClass);
var treeCard = $("." + cardClass);
var collapsable = treeCard.find(".collapse");
const entries = $(`.${textClass}`);
const treeCard = $(`.${cardClass}`);
const collapsable = treeCard.find(".collapse");
entries.show();
treeCard.show();
entries.show();
treeCard.show();
hideCollapsable(collapsable);
} catch (error) {
showErrorPopup(error);
}
hideCollapsable(collapsable);
}
function showMessagePopupWithHtmlAndCallback(title, messageAsHtml, hasCloseButton, callback, executeCallbackByBothButtons) {
@@ -472,22 +437,22 @@ function parseJason(jsonToParse) {
return $.parseJSON(jsonToParse);
} catch (error) {
if(stringContainsDoctype(jsonToParse)) {
showErrorPopup(error, jsonToParse);
window.showErrorPopup(error, jsonToParse);
} else {
showErrorPopup(error);
window.showErrorPopup(error);
}
}
}
function getCurrentTimeStamp() {
var now = new Date(Date.now());
const now = new Date(Date.now());
var date = String(2).padStart(2, now.getDate().toString());
var month = String(2).padStart(2, now.getMonth().toString());
var hours = String(2).padStart(2, now.getHours().toString());
var minutes = String(2).padStart(2, now.getMinutes().toString());
var seconds = String(2).padStart(2, now.getSeconds().toString());
var milliseconds = String(3).padStart(3, now.getMilliseconds().toString());
const date = String(2).padStart(2, now.getDate().toString());
const month = String(2).padStart(2, now.getMonth().toString());
const hours = String(2).padStart(2, now.getHours().toString());
const minutes = String(2).padStart(2, now.getMinutes().toString());
const seconds = String(2).padStart(2, now.getSeconds().toString());
const milliseconds = String(3).padStart(3, now.getMilliseconds().toString());
return `${date}.${month}.${now.getFullYear()} ${hours}:${minutes}:${seconds}.${milliseconds}`;
}

81
BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/dateUtils.js
View File

@@ -1,21 +1,21 @@
function parseTimeInputToIntegerArray(timeString) {
var hoursToMinutes = timeString.split(":");
var hours = parseInt(hoursToMinutes[0]);
var minutes = parseInt(hoursToMinutes[1]);
const hoursToMinutes = timeString.split(":");
const hours = parseInt(hoursToMinutes[0]);
const minutes = parseInt(hoursToMinutes[1]);
return [hours, minutes];
}
function getDateFromPicker(pickerId) {
try {
var picker = $("#" + pickerId);
const picker = $(`#${pickerId}`);
if(picker.length > 0) {
picker.datetimepicker("show");
picker.datetimepicker("hide");
var unixTime = picker.datetimepicker("date");
var targetDate = new Date(unixTime);
const unixTime = picker.datetimepicker("date");
const targetDate = new Date(unixTime);
if(isValidDate(targetDate)) {
return targetDate;
@@ -24,36 +24,36 @@ function getDateFromPicker(pickerId) {
return new Date();
} catch(error) {
showErrorPopup(error);
window.showErrorPopup(error);
} finally {
return new Date();
}
}
function getTimeFromPicker(pickerId) {
var result = new Date();
const result = new Date();
try {
var picker = $("#" + pickerId);
const picker = $(`#${pickerId}`);
if (picker.length > 0) {
var timeString = picker.val();
const timeString = picker.val();
if (timeString.length === 5) {
var hours = timeString.substring(0, 2);
var minutes = timeString.substring(3);
const hours = timeString.substring(0, 2);
const minutes = timeString.substring(3);
result.setHours(hours);
result.setMinutes(minutes);
var date = result.getDate();
var month = result.getMonth();
var year = result.getYear();
const date = result.getDate();
const month = result.getMonth();
const year = result.getYear();
return new Date(year, month, date, hours, minutes, 0, 0);
}
}
} catch (error) {
showErrorPopup(error);
window.showErrorPopup(error);
} finally {
return result;
}
@@ -61,37 +61,37 @@ function getTimeFromPicker(pickerId) {
function dateToShortDateString(date) {
try {
logInfo2("Konvertiere Datum zu kurzem Datum: " + date);
logInfo2(`Konvertiere Datum zu kurzem Datum: ${date}`);
if (isValidDate(date)) {
var ddNum = date.getDate();
var mmNum = date.getMonth();
var yyyyNum = date.getFullYear();
const ddNum = date.getDate();
const mmNum = date.getMonth();
const yyyyNum = date.getFullYear();
var dd = ddNum.toString();
var mm = mmNum.toString();
var yyyy = yyyyNum.toString();
let dd = ddNum.toString();
let mm = mmNum.toString();
let yyyy = yyyyNum.toString();
if (ddNum < 10) {
dd = "0" + dd;
dd = `0${dd}`;
}
if (mmNum < 10) {
mm = "0" + mm;
mm = `0${mm}`;
}
if (yyyyNum < 10) {
yyyy = "000" + yyyyNum;
yyyy = `000${yyyyNum}`;
} else if (yyyyNum < 100) {
yyyy = "00" + yyyyNum;
yyyy = `00${yyyyNum}`;
} else if (yyyyNum < 1000) {
yyyy = "0" + yyyyNum;
yyyy = `0${yyyyNum}`;
}
return dd + "." + mm + "." + yyyy;
}
} catch (error) {
showErrorPopup(error);
window.showErrorPopup(error);
}
}
@@ -100,16 +100,16 @@ function mergeDateAndTime(date, time) {
try {
if (isValidDate(date) && isValidDate(time)) {
var day = date.getDate();
var month = date.getMonth();
var year = date.getFullYear();
var hours = time.getHours();
var minutes = time.getMinutes();
const day = date.getDate();
const month = date.getMonth();
const year = date.getFullYear();
const hours = time.getHours();
const minutes = time.getMinutes();
result = new Date(year, month, day, hours, minutes, 0, 0);
}
} catch (error) {
showErrorPopup(error);
window.showErrorPopup(error);
} finally {
return result;
}
@@ -120,21 +120,20 @@ function isValidDate(date) {
return Object.prototype.toString.call(date) === "[object Date]" && !isNaN(date);
}
function ddMMyyyyToyyyyMMdd(dateString)
{
function ddMMyyyyToyyyyMMdd(dateString) {
if (dateString === undefined || dateString === null || typeof dateString != "string" || dateString.length !== 10) {
return null;
}
var dayMonthYear = dateString.split(".");
const dayMonthYear = dateString.split(".");
if(dayMonthYear.length !== 3) {
return null;
}
var dd = dayMonthYear[0];
var mm = dayMonthYear[1];
var yyyy = dayMonthYear[2];
const dd = dayMonthYear[0];
const mm = dayMonthYear[1];
const yyyy = dayMonthYear[2];
return `${yyyy}-${mm}-${dd}`;
}

6
BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/js-helper.js
View File

@@ -2,7 +2,7 @@
var result = true;
if (a1 !== null && a2 !== null && Array.isArray(a1) && Array.isArray(a2)) {
for (var i = 0; i < a2.length; i++) {
for (let i = 0; i < a2.length; i++) {
if (!a1.includes(a2[i])) {
result = false;
break;
@@ -28,13 +28,13 @@ function isInArray(value, array) {
return false;
}
var intValue = parseInt(value, 10);
const intValue = parseInt(value, 10);
if (isNaN(intValue)) {
return false;
}
for (var i = 0; i < array.length; i++) {
for (let i = 0; i < array.length; i++) {
if (array[i] === intValue) {
return true;
}

16
BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js
View File

@@ -1,5 +1,5 @@
function calculateTimeWithDuration(timeInputValue, timeElement, startDate, duration, hoursMinutesDropdownBtnId) {
var isInMin = getIsZeiterfassungseinheitInMinutes();
var isInMin = window.getIsZeiterfassungseinheitInMinutes();
const hoursToMinutes = parseTimeInputToIntegerArray(timeInputValue);
const hours = parseInt(hoursToMinutes[0]);
@@ -86,13 +86,13 @@ function onDurationChange(startTimeId, endTimeId, startDateId, endDateId, durati
// ToDo: Erst Dauer, dann Start- oder Endzeit führt dazu, dass die Dauer in Stunden benutzt wird!
function calculateDuration(isInvocatedByHoursMinutesButton, startTimeId, endTimeId, durationId, hoursMinutesDropdownBtnId, startDatePickerId, endDatePickerId, isInvokedByStartElement, isInvokedByEndElement) {
var startTime = $("#" + startTimeId).val();
var endTime = $("#" + endTimeId).val();
var duration = $("#" + durationId).val();
var startTime = $(`#${startTimeId}`).val();
var endTime = $(`#${endTimeId}`).val();
var duration = $(`#${durationId}`).val();
var hoursMinutesDropdownButton = $("#" + hoursMinutesDropdownBtnId);
var isInMin = getIsZeiterfassungseinheitInMinutes();
var isInMin = window.getIsZeiterfassungseinheitInMinutes();
if(hoursMinutesDropdownButton.length) {
isInMin = hoursMinutesDropdownButton.text().replaceAll(/\s/g, "") === "Minuten";
@@ -188,4 +188,10 @@ function calculateDuration(isInvocatedByHoursMinutesButton, startTimeId, endTime
$(`#${durationId}`).val(durationNumber);
}
}
}
function calcTimeWithDuration() {
}

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

@@ -334,6 +334,8 @@
<hr />
</div>
</div>
@* ----- Einzelbuchung: Startdatum und gegebenenfalls Enddatum ----- *@
<div class="form-row">

40
BeWoPlanerMobil/Web.config
View File

@@ -169,7 +169,7 @@
<add assembly="BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Mvc, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
@@ -257,11 +257,11 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
<bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -285,15 +285,43 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
<bindingRedirect oldVersion="0.0.0.0-4.2.3.0" newVersion="4.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
<bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>

12
BeWoPlanerMobil/packages.config
View File

@@ -7,7 +7,7 @@
<package id="jQuery" version="3.7.1" targetFramework="net472" />
<package id="jQuery.UI.Combined" version="1.14.1" targetFramework="net472" />
<package id="jQuery.Validation" version="1.21.0" targetFramework="net472" />
<package id="log4net" version="3.0.3" targetFramework="net472" />
<package id="log4net" version="3.0.4" targetFramework="net472" />
<package id="Microsoft.AspNet.Mvc" version="5.3.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Providers.Core" version="2.0.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.3.0" targetFramework="net472" />
@@ -32,10 +32,10 @@
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="Newtonsoft.Json.Bson" version="1.0.3" targetFramework="net472" />
<package id="RestSharp" version="106.13.0" targetFramework="net472" />
<package id="System.Buffers" version="4.6.0" targetFramework="net472" />
<package id="System.Memory" version="4.6.0" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net472" />
<package id="System.Buffers" version="4.6.1" targetFramework="net472" />
<package id="System.Memory" version="4.6.2" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.1" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.6.2" targetFramework="net472" />
<package id="WebGrease" version="1.6.0" targetFramework="net472" />
</packages>

3
Shared/BeWoEntityEnums.cs
View File

@@ -601,8 +601,11 @@ namespace BS.Shared
ConfirmationReceiptSignatures_Delete = 50000,
/// <summary>Einzelunterschriften leisten</summary>
Signature_ProvideSingleSignature = 60000,
/// <summary>Monatsunterschriften leisten</summary>
Signature_ProvideMonthlySignature = 60001,
/// <summary>Stellvertretend Monatsunterschriften leisten</summary>
Signature_ProvideMonthlySignatureByProxy = 60002,
Customer_Anonymization = 171717,