Merge branch 'master' into feature/timeline

templates/admin/index.html.twig

@@ -200,7 +200,7 @@
             <h2 class="flex justify-between pb-2">
                 <span class="font-bold text-lg">Überfällige Feedbacks</span>
                 {% if overdueFeedbacksCount > 0 %}
-                    <span>{{ overdueFeedbacksCount }} überfälllig</span>
+                    <span>{{ overdueFeedbacksCount }} überfällig</span>
                 {% endif %}
             </h2>
             <div class="max-h-64 overflow-y-scroll overflow-x-hidden">
@@ -235,7 +235,7 @@
             <h2 class="flex justify-between pb-2">
                 <span class="font-bold text-lg">Überfällige Honorarverträge</span>
                 {% if overdueContractsCount > 0 %}
-                    <span>{{ overdueContractsCount }} überfälllig</span>
+                    <span>{{ overdueContractsCount }} überfällig</span>
                 {% endif %}
             </h2>
             <div class="max-h-64 overflow-y-scroll overflow-x-hidden">
@@ -262,4 +262,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock %}

templates/admin/system/job_profile/_form.html.twig

@@ -4,6 +4,7 @@
     {{ form_row(form.feedbackSet) }}
     {{ form_row(form.requiredTrainings) }}
     {{ form_row(form.requiredLicenses) }}
+    {{ form_row(form.costUnit) }}
 </div>
 <div class="flex items-center space-x-2">
     <button type="submit" class="btn">

templates/admin/system/job_profile/index.html.twig

@@ -27,7 +27,9 @@
                     {% for jobProfile in jobProfiles %}
                         <tr>
                             <td>
-                                {{ jobProfile.name }}
+                                <a href="{{ path('app_admin_system_job_profile_edit', { 'id': jobProfile.id }) }}">
+                                    {{ jobProfile.name }}
+                                </a>
                             </td>
                             <td>
                                 <ul>
@@ -81,4 +83,4 @@
         <a href="{{ path('app_admin_system_job_profile_create') }}" class="btn">
             Neu
         </a>
-{% endblock %}
+{% endblock %}

templates/administrative/assignment/_form.html.twig

@@ -34,7 +34,6 @@
         <div class="grid grid-cols-1 gap-y-4">
             {{ form_row(form.contact) }}
             {{ form_row(form.remarks) }}
-            {{ form_row(form.costCenter) }}
         </div>
     </div>
 </div>

templates/manager/index.html.twig

@@ -93,7 +93,7 @@
             <h2 class="flex justify-between pb-2">
                 <span class="font-bold text-lg">Überfällige Feedbacks</span>
                 {% if overdueFeedbacksCount > 0 %}
-                    <span>{{ overdueFeedbacksCount }} überfälllig</span>
+                    <span>{{ overdueFeedbacksCount }} überfällig</span>
                 {% endif %}
             </h2>
             <div class="max-h-64 overflow-y-scroll overflow-x-hidden">