Skip to content

Commit

Permalink
#380 fix MR missing some changes due to revert commit + fix some code…
Browse files Browse the repository at this point in the history
… style
  • Loading branch information
KlausRicharz committed Jul 21, 2024
1 parent 1705acb commit c40fc5f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ main.timereport.select.status.closed.text=geschlossen
main.timereport.comment.text=Kommentar
main.timereport.selectorder.text=Zum Hinzufügen einer Buchung muß ein Auftrag ausgewählt werden.
main.timereport.confirmclose.text=Soll die Buchung wirklich endgültig geschlossen werden?
main.timereport.extendtime.error.text=Fehler beim Verlängern der Zeit
main.timereport.optional.help.text=(optionale Buchungshilfe)
main.timereport.mass.edit.text=Massenbearbeitung
main.timereport.mass.edit.shift.days.text=Tage verschieben
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ main.timereport.select.status.closed.text=closed
main.timereport.comment.text=Comment
main.timereport.selectorder.text=To add a timereport, a customer order must be selected.
main.timereport.confirmclose.text=Do you really want to close this timereport permanently?
main.timereport.extendtime.error.text=Error extending time to now
main.timereport.optional.help.text=(optional help)
main.timereport.mass.edit.text=mass editing
main.timereport.mass.edit.shift.days.text=shift by days
Expand Down
10 changes: 7 additions & 3 deletions src/main/webapp/dailyreport/showDailyReport.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@
}
}
function saveBegin(form) {
function saveBegin(form, time) {
if (time != null) {
form.selectedWorkHourBegin.value = time.getHours();
form.selectedWorkMinuteBegin.value = roundMinutes(time.getMinutes());
}
form.action = "/do/ShowDailyReport?task=saveBegin";
form.submit();
}
Expand All @@ -131,7 +135,7 @@
if (res[1]<0) res= [res[0]-1, 60-res[1]];
if (res[1]>=60) res= [res[0]+1, res[1]-60];
if (res[0]<0){
confirm("<bean:message key="main.timereport.extendTime.error.text" />");
confirm("<bean:message key="main.timereport.extendtime.error.text" />");
return currentValue;
}
return res;
Expand All @@ -142,7 +146,7 @@
var newValue=getExtendTime([form.selectedBreakHour.value, form.selectedBreakMinute.value], time)
if(newValue[0]>5){
newValue=[5,55];
confirm("<bean:message key="main.timereport.extendTime.error.text" />");
confirm("<bean:message key="main.timereport.extendtime.error.text" />");
}
form.selectedBreakHour.value =newValue[0];
form.selectedBreakMinute.value = newValue[1];
Expand Down

0 comments on commit c40fc5f

Please sign in to comment.