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

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source 
# Conflicts:
#	Data/Mappings/Organisation.hbm.xml
This commit is contained in:
Christian
2025-06-17 13:09:22 +02:00
parent 434c42b049 b96166c440
commit d90429fe9a
71 changed files with 2444 additions and 32217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,10 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd
const endDateValue = endDateInput.val();
const endTimeValue = endTimeInput.val();
const durationValue = durationInput.val();
const isInMin = hoursMinutesBtn.length === 0 || hoursMinutesBtn.length > 0 && hoursMinutesBtn.text().replaceAll(/\s/g, "") !== "Minuten";
//alert(hoursMinutesBtn.text());
const isInMin = hoursMinutesBtn.length === 0 || hoursMinutesBtn.length > 0 && hoursMinutesBtn.text().replaceAll(/\s/g, "") === "Minuten";
//alert(isInMin);
const hasEndDate = endDateInput.length;
if (startDateValue.length === 0) {
@@ -261,7 +264,8 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd
}
durationInput.val(dauer);
} else if(true === isStartTimeValid && true === isDurationValid) {
} else if (true === isStartTimeValid && true === isDurationValid) {
var newDuration = duration;
if(true === isFormatChange) {
let newDurationValue = true === isInMin ? duration * 60.0 : duration / 60.0;
@@ -270,9 +274,10 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd
} else {
durationInput.val(newDurationValue);
}
newDuration = newDurationValue;
}
calcTimeWithDuration(startTimeValue, endTimeInput, start, duration, isFormatChange, isInMin);
calcTimeWithDuration(startTimeValue, endTimeInput, start, newDuration, isFormatChange, isInMin);
} else if(true === isEndTimeValid && true === isDurationValid) {
if(true === isFormatChange) {
durationInput.val(formatDuration(isInMin, true === isInMin ? duration * 60.0 : duration / 60.0));