Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
This commit is contained in:
parent
c936813967
commit
5fb0bc2444
43 changed files with 95 additions and 118 deletions
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
= simple_form_for @task do |f|
|
||||
= f.input :name
|
||||
= f.input :description
|
||||
= f.input :description, as: :text, input_html: {rows: 10}
|
||||
= f.input :duration, :as => :select, :collection => 1..3
|
||||
= f.input :user_list, :as => :string, :input_html => { 'data-pre' => @task.users.map { |u| u.token_attributes }.to_json }
|
||||
= f.input :required_users
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@
|
|||
Gruppenaufgaben
|
||||
%ul
|
||||
- for group in Workgroup.all
|
||||
%li= link_to group.name, :controller => 'tasks', :action => "workgroup", :id => group
|
||||
%li= link_to group.name, workgroup_tasks_path(workgroup_id: group.id)
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
%td Arbeitsgruppe
|
||||
%td
|
||||
- if @task.workgroup
|
||||
= link_to @task.workgroup.name, :action => "workgroup", :id => @task.workgroup
|
||||
= link_to @task.workgroup.name, workgroup_tasks_path(workgroup_id: @task.workgroup_id)
|
||||
|
||||
%tr
|
||||
%td{:colspan => "2"}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
%h2 Wöchentliche Aufgaben verwalten
|
||||
.column_content
|
||||
- if @group.weekly_task
|
||||
%p= "Jeden <b>#{weekday(@group.weekday)}</b> hat diese Arbeitsgruppe folgenden Job: <b>#{@group.task_name}</b>"
|
||||
%p Jeden <b>#{weekday(@group.weekday)}</b> hat diese Arbeitsgruppe folgenden Job: <b>#{@group.task_name}</b>
|
||||
%p Die Wochenaufgaben werden von der Foodsoft automatisch erstellt. Eintragen müsst Ihr Euch aber selber.
|
||||
- else
|
||||
Noch keine Wochenaufgaben angelegt.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue