From a2ce032d884bfbf94321c5f6ec012981807d0af9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Thu, 29 Apr 2021 15:21:06 +0200 Subject: [PATCH] Zeiterfassung: Elemente in Eingabemaske untereinander anordnen --- templates/webpages/time_recording/form.html | 123 +++++++++++--------- 1 file changed, 67 insertions(+), 56 deletions(-) diff --git a/templates/webpages/time_recording/form.html b/templates/webpages/time_recording/form.html index 59c47fc08..62e486f14 100644 --- a/templates/webpages/time_recording/form.html +++ b/templates/webpages/time_recording/form.html @@ -13,62 +13,73 @@ [% L.hidden_tag('callback', FORM.callback) %] - - - [%- IF SELF.use_duration %] - - - [%- ELSE %] - - - [%- END %] - - - - - - - - - - - [%- IF SELF.use_duration %] - - - [%- ELSE %] - - - [%- END %] - - - - - - - - + [%- IF SELF.use_duration %] + + + + + + + + + [%- ELSE %] + + + + + + + + + [%- END %] + + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Date' | $T8 %][% 'Duration' | $T8 %] ([% 'in minutes' | $T8 %])[% 'Start' | $T8 %][% 'End' | $T8 %][% 'Sales Order' | $T8 %][% 'Customer' | $T8 %][% 'Project' | $T8 %][% 'Article' | $T8 %][% 'Description' | $T8 %][% 'Mitarbeiter' | $T8 %]
- [% P.date_tag('time_recording.date_as_date', SELF.time_recording.date_as_date, "data-validate"="required", "data-title"=LxERP.t8('Date')) %]
- 		- [% P.input_tag('time_recording.duration', SELF.time_recording.duration, size=15) %] - - [% P.date_tag('start_date', SELF.start_date, "data-validate"="required", "data-title"=LxERP.t8('Start date'), onchange='kivi.TimeRecording.set_end_date()') %]
- [% P.input_tag('start_time', SELF.start_time, type="time", "data-validate"="required", "data-title"=LxERP.t8('Start time')) %] - [% P.button_tag('kivi.TimeRecording.set_current_date_time("start")', LxERP.t8('now')) %] - 		- [% P.date_tag('end_date', SELF.end_date) %]
- [% P.input_tag('end_time', SELF.end_time, type="time") %] - [% P.button_tag('kivi.TimeRecording.set_current_date_time("end")', LxERP.t8('now')) %] - 		[% P.select_tag('time_recording.order_id', SELF.all_orders, default=SELF.time_recording.order_id, title_key='digest', with_empty=1, onchange='kivi.TimeRecording.order_changed(this.value)') %][% P.customer_vendor.picker('time_recording.customer_id', SELF.time_recording.customer_id, type='customer', style='width: 300px', "data-validate"="required", "data-title"=LxERP.t8('Customer')) %][% P.project.picker('time_recording.project_id', SELF.time_recording.project_id, style='width: 300px') %][% P.select_tag('time_recording.part_id', SELF.all_time_recording_articles, default=SELF.time_recording.part_id, with_empty=1, value_key='id', title_key='description') %][% L.textarea_tag('time_recording.description', SELF.time_recording.description, wrap="soft", style="width: 350px; height: 150px", class="texteditor", "data-validate"="required", "data-title"=LxERP.t8('Description')) %] - [%- IF SELF.can_edit_all -%] - [% L.select_tag('time_recording.staff_member_id', SELF.all_employees, - default => SELF.time_recording.staff_member_id, - title_key => 'safe_name', - value_key => 'id', - style => 'width: 200px') %] - [%- ELSE -%] - [% SELF.time_recording.staff_member.safe_name | html %] - [%- END -%] -
[% 'Date' | $T8 %] + [% P.date_tag('time_recording.date_as_date', SELF.time_recording.date_as_date, "data-validate"="required", "data-title"=LxERP.t8('Date')) %]
+
[% 'Duration' | $T8 %] ([% 'in minutes' | $T8 %]) + [% P.input_tag('time_recording.duration', SELF.time_recording.duration, size=11) %] +
[% 'Start' | $T8 %] + [% P.date_tag('start_date', SELF.start_date, "data-validate"="required", "data-title"=LxERP.t8('Start date'), onchange='kivi.TimeRecording.set_end_date()') %] + [% P.input_tag('start_time', SELF.start_time, type="time", "data-validate"="required", "data-title"=LxERP.t8('Start time')) %] + [% P.button_tag('kivi.TimeRecording.set_current_date_time("start")', LxERP.t8('now')) %] +
[% 'End' | $T8 %] + [% P.date_tag('end_date', SELF.end_date) %] + [% P.input_tag('end_time', SELF.end_time, type="time") %] + [% P.button_tag('kivi.TimeRecording.set_current_date_time("end")', LxERP.t8('now')) %] +
[% 'Sales Order' | $T8 %][% P.select_tag('time_recording.order_id', SELF.all_orders, default=SELF.time_recording.order_id, title_key='digest', with_empty=1, style='width: 300px', onchange='kivi.TimeRecording.order_changed(this.value)') %]
[% 'Customer' | $T8 %][% P.customer_vendor.picker('time_recording.customer_id', SELF.time_recording.customer_id, type='customer', style='width: 300px', "data-validate"="required", "data-title"=LxERP.t8('Customer')) %]
[% 'Project' | $T8 %][% P.project.picker('time_recording.project_id', SELF.time_recording.project_id, style='width: 300px') %]
[% 'Article' | $T8 %][% P.select_tag('time_recording.part_id', SELF.all_time_recording_articles, default=SELF.time_recording.part_id, with_empty=1, value_key='id', title_key='description', style='width: 300px') %]
[% 'Description' | $T8 %][% L.textarea_tag('time_recording.description', SELF.time_recording.description, wrap="soft", style="width: 300px; height: 150px", class="texteditor", "data-validate"="required", "data-title"=LxERP.t8('Description')) %]
[% 'Mitarbeiter' | $T8 %] + [%- IF SELF.can_edit_all -%] + [% L.select_tag('time_recording.staff_member_id', SELF.all_employees, + default => SELF.time_recording.staff_member_id, + title_key => 'safe_name', + value_key => 'id', + style => 'width: 300px') %] + [%- ELSE -%] + [% SELF.time_recording.staff_member.safe_name | html %] + [%- END -%] +
-- 2.20.1