Improve history by showing more information, fix users list
This commit is contained in:
parent
d803591a91
commit
b62d4b4dce
|
@ -72,6 +72,12 @@ function Shift_editor_info_render(Shift $shift)
|
||||||
User_Nick_render($shift->updatedBy)
|
User_Nick_render($shift->updatedBy)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
if ($shift->transaction_id) {
|
||||||
|
$info[] = sprintf(
|
||||||
|
icon('clock-history') . __('History ID: %s'),
|
||||||
|
$shift->transaction_id
|
||||||
|
);
|
||||||
|
}
|
||||||
return join('<br />', $info);
|
return join('<br />', $info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1089,6 +1089,9 @@ msgstr "erstellt am %s von %s"
|
||||||
msgid "edited at %s by %s"
|
msgid "edited at %s by %s"
|
||||||
msgstr "bearbeitet am %s von %s"
|
msgstr "bearbeitet am %s von %s"
|
||||||
|
|
||||||
|
msgid "History ID: %s"
|
||||||
|
msgstr "Historien-ID: %s"
|
||||||
|
|
||||||
msgid "This shift is in the far future and becomes available for signup at %s."
|
msgid "This shift is in the far future and becomes available for signup at %s."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Diese Schicht liegt in der fernen Zukunft und du kannst dich ab %s eintragen."
|
"Diese Schicht liegt in der fernen Zukunft und du kannst dich ab %s eintragen."
|
||||||
|
@ -1936,6 +1939,9 @@ msgid "angeltypes.hide_on_shift_view.info"
|
||||||
msgstr "Wenn ausgewählt, können nur Admins und Mitglieder des Engeltyps auf der "
|
msgstr "Wenn ausgewählt, können nur Admins und Mitglieder des Engeltyps auf der "
|
||||||
"Schicht Seite die Filteroption für diesen Engeltyp sehen."
|
"Schicht Seite die Filteroption für diesen Engeltyp sehen."
|
||||||
|
|
||||||
|
msgid "location.location"
|
||||||
|
msgstr "Ort"
|
||||||
|
|
||||||
msgid "location.locations"
|
msgid "location.locations"
|
||||||
msgstr "Orte"
|
msgstr "Orte"
|
||||||
|
|
||||||
|
|
|
@ -675,6 +675,9 @@ msgstr "If checked only admins and members of the angeltype "
|
||||||
msgid "registration.register"
|
msgid "registration.register"
|
||||||
msgstr "Register"
|
msgstr "Register"
|
||||||
|
|
||||||
|
msgid "location.location"
|
||||||
|
msgstr "Location"
|
||||||
|
|
||||||
msgid "location.locations"
|
msgid "location.locations"
|
||||||
msgstr "Locations"
|
msgstr "Locations"
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{ __('general.id') }}</th>
|
<th>{{ __('general.id') }}</th>
|
||||||
<th>{{ __('title.title') }}</th>
|
<th>{{ __('title.title') }}</th>
|
||||||
|
<th>{{ __('location.location') }}</th>
|
||||||
<th>{{ __('general.count') }}</th>
|
<th>{{ __('general.count') }}</th>
|
||||||
<th>{{ __('shifts.start') }}</th>
|
<th>{{ __('shifts.start') }}</th>
|
||||||
<th>{{ __('shifts.end') }}</th>
|
<th>{{ __('shifts.end') }}</th>
|
||||||
|
@ -40,8 +41,10 @@
|
||||||
{{ __('shifts.history.schedule', [shift.schedule.name]) }}
|
{{ __('shifts.history.schedule', [shift.schedule.name]) }}
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ shift.title }}
|
{{ shift.title }}
|
||||||
{% endif %}
|
{% endif %}<br>
|
||||||
|
{{ shift.shiftType.name }}
|
||||||
</td>
|
</td>
|
||||||
|
<td>{{ shift.location.name }}</td>
|
||||||
<td>{{ shift.count }}</td>
|
<td>{{ shift.count }}</td>
|
||||||
<td>{{ shift.start.format(__('general.datetime')) }}</td>
|
<td>{{ shift.start.format(__('general.datetime')) }}</td>
|
||||||
<td>{{ shift.end.format(__('general.datetime')) }}</td>
|
<td>{{ shift.end.format(__('general.datetime')) }}</td>
|
||||||
|
|
Loading…
Reference in New Issue