Make unassigned tasks more prominent in the dashboard
Show all unassigned task in the dashboard to make it more interesting for members to pick tasks. Some members do not (want to) click on the task list very often it is not clear if there are new tasks if we show the number of unassigned tasks only.
This commit is contained in:
parent
4cae94eff9
commit
72ef31c0ec
9 changed files with 48 additions and 54 deletions
|
@ -6,7 +6,7 @@
|
||||||
-# placeholder deface to add content using erb[silent]:contains()
|
-# placeholder deface to add content using erb[silent]:contains()
|
||||||
- '<dashboard_top_mark>'
|
- '<dashboard_top_mark>'
|
||||||
|
|
||||||
- unless @unaccepted_tasks.empty? && @next_tasks.empty? && @unassigned_tasks.size == 0
|
- unless @unaccepted_tasks.empty? && @next_tasks.empty?
|
||||||
%section.row-fluid
|
%section.row-fluid
|
||||||
- unless @next_tasks.empty?
|
- unless @next_tasks.empty?
|
||||||
.span3.well
|
.span3.well
|
||||||
|
@ -20,11 +20,12 @@
|
||||||
%h4= t '.tasks_move.title'
|
%h4= t '.tasks_move.title'
|
||||||
= t '.tasks_move.desc'
|
= t '.tasks_move.desc'
|
||||||
= link_to t('.tasks_move.action'), user_tasks_path
|
= link_to t('.tasks_move.action'), user_tasks_path
|
||||||
- unless @unassigned_tasks.size == 0
|
|
||||||
.span3.well
|
- if @unassigned_tasks.size > 0
|
||||||
%h4= t '.tasks_open.title'
|
%section
|
||||||
= t '.tasks_open.desc', size: @unassigned_tasks.size
|
%h2= t '.tasks_open.title'
|
||||||
= link_to t('.tasks_open.action'), tasks_path
|
= render 'shared/task_list', tasks: @unassigned_tasks
|
||||||
|
= link_to t('.tasks_open.view_all'), tasks_path
|
||||||
|
|
||||||
- if current_user.ordergroup
|
- if current_user.ordergroup
|
||||||
= render :partial => 'shared/open_orders', :locals => {:ordergroup => current_user.ordergroup}
|
= render :partial => 'shared/open_orders', :locals => {:ordergroup => current_user.ordergroup}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
- unless @non_group_tasks.empty?
|
- unless @non_group_tasks.empty?
|
||||||
%section
|
%section
|
||||||
%h3= t '.title_non_group'
|
%h3= t '.title_non_group'
|
||||||
= render 'list', tasks: @non_group_tasks
|
= render 'shared/task_list', tasks: @non_group_tasks
|
||||||
|
|
||||||
|
|
||||||
- for group in @groups
|
- for group in @groups
|
||||||
|
@ -14,5 +14,5 @@
|
||||||
%h3
|
%h3
|
||||||
= group.name
|
= group.name
|
||||||
%small= link_to t('.show_group_tasks'), workgroup_tasks_path(workgroup_id: group)
|
%small= link_to t('.show_group_tasks'), workgroup_tasks_path(workgroup_id: group)
|
||||||
= render 'list', tasks: tasks
|
= render 'shared/task_list', tasks: tasks
|
||||||
= link_to_top
|
= link_to_top
|
||||||
|
|
|
@ -4,14 +4,13 @@
|
||||||
- unless @unaccepted_tasks.empty?
|
- unless @unaccepted_tasks.empty?
|
||||||
%section
|
%section
|
||||||
%h3= t '.title_open'
|
%h3= t '.title_open'
|
||||||
= render 'list', tasks: @unaccepted_tasks
|
= render 'shared/task_list', tasks: @unaccepted_tasks
|
||||||
|
|
||||||
%section
|
%section
|
||||||
%h3= t '.title_accepted'
|
%h3= t '.title_accepted'
|
||||||
- unless @accepted_tasks.empty?
|
- unless @accepted_tasks.empty?
|
||||||
= render 'list', tasks: @accepted_tasks
|
= render 'shared/task_list', tasks: @accepted_tasks
|
||||||
- else
|
- else
|
||||||
= t('.more', tasks_link: link_to(t('.tasks_link'), tasks_path)).html_safe
|
= t('.more', tasks_link: link_to(t('.tasks_link'), tasks_path)).html_safe
|
||||||
%br/
|
%br/
|
||||||
= link_to_top
|
= link_to_top
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
|
|
||||||
%section
|
%section
|
||||||
%h3= t '.title_all'
|
%h3= t '.title_all'
|
||||||
= render 'list', tasks: @group.open_tasks
|
= render 'shared/task_list', tasks: @group.open_tasks
|
||||||
%br/
|
%br/
|
||||||
= link_to_top
|
= link_to_top
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -951,9 +951,8 @@ de:
|
||||||
desc: Du bis für Aufgaben verantwortlich.
|
desc: Du bis für Aufgaben verantwortlich.
|
||||||
title: Aufgaben übernehmen
|
title: Aufgaben übernehmen
|
||||||
tasks_open:
|
tasks_open:
|
||||||
action: offene Aufgabe(n)
|
|
||||||
desc: Es gibt %{size}
|
|
||||||
title: Offene Aufgaben
|
title: Offene Aufgaben
|
||||||
|
view_all: Alle Aufgaben anzeigen
|
||||||
title: Startseite
|
title: Startseite
|
||||||
your_tasks: Deine Aufgaben
|
your_tasks: Deine Aufgaben
|
||||||
no_ordergroups: Leider bist Du kein Mitglied einer Bestellgruppe
|
no_ordergroups: Leider bist Du kein Mitglied einer Bestellgruppe
|
||||||
|
@ -1452,6 +1451,14 @@ de:
|
||||||
title: Laufende Bestellungen
|
title: Laufende Bestellungen
|
||||||
total_sum: Gesamtsumme
|
total_sum: Gesamtsumme
|
||||||
who_ordered: Wer hat bestellt?
|
who_ordered: Wer hat bestellt?
|
||||||
|
task_list:
|
||||||
|
accept_task: Aufgabe übernehmen
|
||||||
|
done: Erledigt
|
||||||
|
done_q: Erledigt?
|
||||||
|
mark_done: Aufgabe als erledigt markieren
|
||||||
|
reject_task: Aufgabe ablehnen
|
||||||
|
who: Wer machts?
|
||||||
|
who_hint: "(Wie viele werden noch benötigt?)"
|
||||||
user_form_fields:
|
user_form_fields:
|
||||||
contact_address_hint: Die Adresse deiner Bestellgruppe. Wenn du sie aktualisierst, wird sie auch bei den anderen Mitgliedern deiner Bestellgruppe aktualisiert.
|
contact_address_hint: Die Adresse deiner Bestellgruppe. Wenn du sie aktualisierst, wird sie auch bei den anderen Mitgliedern deiner Bestellgruppe aktualisiert.
|
||||||
workgroup_members:
|
workgroup_members:
|
||||||
|
@ -1642,14 +1649,6 @@ de:
|
||||||
show_group_tasks: Gruppenaufgaben anzeigen
|
show_group_tasks: Gruppenaufgaben anzeigen
|
||||||
title: Aufgaben
|
title: Aufgaben
|
||||||
title_non_group: Aufgaben für alle!
|
title_non_group: Aufgaben für alle!
|
||||||
list:
|
|
||||||
accept_task: Aufgabe übernehmen
|
|
||||||
done: Erledigt
|
|
||||||
done_q: Erledigt?
|
|
||||||
mark_done: Aufgabe als erledigt markieren
|
|
||||||
reject_task: Aufgabe ablehnen
|
|
||||||
who: Wer machts?
|
|
||||||
who_hint: "(Wie viele werden noch benötigt?)"
|
|
||||||
nav:
|
nav:
|
||||||
all_tasks: Alle Aufgaben
|
all_tasks: Alle Aufgaben
|
||||||
archive: Erledigte Aufgaben (Archiv)
|
archive: Erledigte Aufgaben (Archiv)
|
||||||
|
|
|
@ -964,9 +964,8 @@ en:
|
||||||
desc: You are responsible for these tasks.
|
desc: You are responsible for these tasks.
|
||||||
title: Take over tasks
|
title: Take over tasks
|
||||||
tasks_open:
|
tasks_open:
|
||||||
action: open task(s)
|
|
||||||
desc: There is/are %{size}
|
|
||||||
title: Open tasks
|
title: Open tasks
|
||||||
|
view_all: Show all tasks
|
||||||
title: Homepage
|
title: Homepage
|
||||||
your_tasks: Your tasks
|
your_tasks: Your tasks
|
||||||
no_ordergroups: You are unfortunately not a member of an ordergroup.
|
no_ordergroups: You are unfortunately not a member of an ordergroup.
|
||||||
|
@ -1474,6 +1473,14 @@ en:
|
||||||
title: Current orders
|
title: Current orders
|
||||||
total_sum: Total sum
|
total_sum: Total sum
|
||||||
who_ordered: Who ordered?
|
who_ordered: Who ordered?
|
||||||
|
task_list:
|
||||||
|
accept_task: Accept task
|
||||||
|
done: Done
|
||||||
|
done_q: Done?
|
||||||
|
mark_done: Mark task as done
|
||||||
|
reject_task: Reject task
|
||||||
|
who: Who is doing it?
|
||||||
|
who_hint: "(How much are still needed?)"
|
||||||
user_form_fields:
|
user_form_fields:
|
||||||
contact_address_hint: The address of your ordergroup. If you update this, it changes for other members of the ordergroup as well.
|
contact_address_hint: The address of your ordergroup. If you update this, it changes for other members of the ordergroup as well.
|
||||||
workgroup_members:
|
workgroup_members:
|
||||||
|
@ -1664,14 +1671,6 @@ en:
|
||||||
show_group_tasks: Show group tasks
|
show_group_tasks: Show group tasks
|
||||||
title: Tasks
|
title: Tasks
|
||||||
title_non_group: Tasks for all!
|
title_non_group: Tasks for all!
|
||||||
list:
|
|
||||||
accept_task: Accept task
|
|
||||||
done: Done
|
|
||||||
done_q: Done?
|
|
||||||
mark_done: Mark task as done
|
|
||||||
reject_task: Reject task
|
|
||||||
who: Who is doing it?
|
|
||||||
who_hint: "(How much are still needed?)"
|
|
||||||
nav:
|
nav:
|
||||||
all_tasks: All tasks
|
all_tasks: All tasks
|
||||||
archive: Completed tasks (archive)
|
archive: Completed tasks (archive)
|
||||||
|
|
|
@ -961,9 +961,8 @@ fr:
|
||||||
desc: Tu as du boulot de prévu.
|
desc: Tu as du boulot de prévu.
|
||||||
title: Accepter des boulot
|
title: Accepter des boulot
|
||||||
tasks_open:
|
tasks_open:
|
||||||
action: boulot(s) disponible(s)
|
|
||||||
desc: Il y a %{size}
|
|
||||||
title: Boulots disponibles
|
title: Boulots disponibles
|
||||||
|
view_all: Afficher tous les boulots
|
||||||
title: Page d'accueil
|
title: Page d'accueil
|
||||||
your_tasks: Voilà le boulot que tu as accepté en ce moment
|
your_tasks: Voilà le boulot que tu as accepté en ce moment
|
||||||
no_ordergroups: Tu ne fais encore partie d'aucune cellule
|
no_ordergroups: Tu ne fais encore partie d'aucune cellule
|
||||||
|
@ -1460,6 +1459,14 @@ fr:
|
||||||
title: Commandes en cours
|
title: Commandes en cours
|
||||||
total_sum: Total
|
total_sum: Total
|
||||||
who_ordered: Qui a commandé?
|
who_ordered: Qui a commandé?
|
||||||
|
task_list:
|
||||||
|
accept_task: Te charger de ce boulot
|
||||||
|
done: Effectué
|
||||||
|
done_q: Effectué?
|
||||||
|
mark_done: Marquer ce boulot comme étant effectué
|
||||||
|
reject_task: Refuser ce boulot
|
||||||
|
who: Qui le fait?
|
||||||
|
who_hint: "(Combien manquent encore?)"
|
||||||
user_form_fields:
|
user_form_fields:
|
||||||
contact_address_hint:
|
contact_address_hint:
|
||||||
workgroup_members:
|
workgroup_members:
|
||||||
|
@ -1658,14 +1665,6 @@ fr:
|
||||||
show_group_tasks: Afficher l'agenda de cette équipe
|
show_group_tasks: Afficher l'agenda de cette équipe
|
||||||
title: Agenda
|
title: Agenda
|
||||||
title_non_group: Boulots ouverts à tou-te-s
|
title_non_group: Boulots ouverts à tou-te-s
|
||||||
list:
|
|
||||||
accept_task: Te charger de ce boulot
|
|
||||||
done: Effectué
|
|
||||||
done_q: Effectué?
|
|
||||||
mark_done: Marquer ce boulot comme étant effectué
|
|
||||||
reject_task: Refuser ce boulot
|
|
||||||
who: Qui le fait?
|
|
||||||
who_hint: "(Combien manquent encore?)"
|
|
||||||
nav:
|
nav:
|
||||||
all_tasks: L'agenda de la boufcoop
|
all_tasks: L'agenda de la boufcoop
|
||||||
archive: Boulots déjà effectués (archives)
|
archive: Boulots déjà effectués (archives)
|
||||||
|
|
|
@ -952,9 +952,8 @@ nl:
|
||||||
desc: Je bent voor de volgende taken verantwoordelijk.
|
desc: Je bent voor de volgende taken verantwoordelijk.
|
||||||
title: Taken op je nemen
|
title: Taken op je nemen
|
||||||
tasks_open:
|
tasks_open:
|
||||||
action: open taken
|
|
||||||
desc: Er zijn %{size}
|
|
||||||
title: open taken
|
title: open taken
|
||||||
|
view_all: Alle taken bekijken
|
||||||
title: Hoofdpagina
|
title: Hoofdpagina
|
||||||
your_tasks: Jouw taken
|
your_tasks: Jouw taken
|
||||||
no_ordergroups: Jammergenoeg ben je niet aangesloten bij een huishouden.
|
no_ordergroups: Jammergenoeg ben je niet aangesloten bij een huishouden.
|
||||||
|
@ -1455,6 +1454,14 @@ nl:
|
||||||
title: Lopende bestellingen
|
title: Lopende bestellingen
|
||||||
total_sum: Totaalsom
|
total_sum: Totaalsom
|
||||||
who_ordered: Wie heeft besteld?
|
who_ordered: Wie heeft besteld?
|
||||||
|
task_list:
|
||||||
|
accept_task: Taak accepteren
|
||||||
|
done: Gedaan
|
||||||
|
done_q: Gedaan?
|
||||||
|
mark_done: Taak als gedaan markeren
|
||||||
|
reject_task: Taak laten vallen
|
||||||
|
who: Wie doet het?
|
||||||
|
who_hint: "(Hoeveel zijn er nog nodig?)"
|
||||||
user_form_fields:
|
user_form_fields:
|
||||||
contact_address_hint: Het adres van je huishouden. Als je dit wijzigt, verandert het ook voor de andere leden van je huishouden.
|
contact_address_hint: Het adres van je huishouden. Als je dit wijzigt, verandert het ook voor de andere leden van je huishouden.
|
||||||
workgroup_members:
|
workgroup_members:
|
||||||
|
@ -1645,14 +1652,6 @@ nl:
|
||||||
show_group_tasks: Groepstaken tonen
|
show_group_tasks: Groepstaken tonen
|
||||||
title: Taken
|
title: Taken
|
||||||
title_non_group: Taken voor iedereen!
|
title_non_group: Taken voor iedereen!
|
||||||
list:
|
|
||||||
accept_task: Taak accepteren
|
|
||||||
done: Gedaan
|
|
||||||
done_q: Gedaan?
|
|
||||||
mark_done: Taak als gedaan markeren
|
|
||||||
reject_task: Taak laten vallen
|
|
||||||
who: Wie doet het?
|
|
||||||
who_hint: "(Hoeveel zijn er nog nodig?)"
|
|
||||||
nav:
|
nav:
|
||||||
all_tasks: Alle taken
|
all_tasks: Alle taken
|
||||||
archive: Gedane taken (archief)
|
archive: Gedane taken (archief)
|
||||||
|
|
Loading…
Reference in a new issue