diff --git a/README.md b/README.md index fc01b18..bf676b1 100644 --- a/README.md +++ b/README.md @@ -296,6 +296,8 @@ The following manual tests were made: - [see issue #179 here](https://github.com/mikerae/string-rota/issues/179) - [Fix Allocate Reserve Button for Admin and Rota Manager #184 Testing](/readme_assets/images/testing-issue184.png) - [see issue #184 here](https://github.com/mikerae/string-rota/issues/184) +- [Update messaging #176 Testing](/readme_assets/images/testing-issue176.png) + - [see issue #176 here](https://github.com/mikerae/string-rota/issues/176) #### Human Testing No human testing was done for this MVP, but once office manager functionality, and the hiding of draft rotas is implemented, user feedback will be sort. diff --git a/readme_assets/images/testing-issue176.png b/readme_assets/images/testing-issue176.png new file mode 100644 index 0000000..5071455 Binary files /dev/null and b/readme_assets/images/testing-issue176.png differ diff --git a/string_rota/templates/string_rota/home.html b/string_rota/templates/string_rota/home.html index 0349ebd..0ed5faf 100644 --- a/string_rota/templates/string_rota/home.html +++ b/string_rota/templates/string_rota/home.html @@ -34,47 +34,65 @@

Select a Project {% if office %}and a Section{% endif %} - -
-
- {% if messages %} -
    - {% for message in messages %} - {% with message.level as level %} -
  • - {% if level == 40 %} - {{ message }} - {% elif level == 30 %} - {{ message }} - {% elif level == 25 %} - {{ message }} - {% else %} - {{ message }} - {% endif %} -
    • - {% endwith %} - {% endfor %} -
- {% endif %} -
-
- - {% if rota_manager or office %} + +
-
-
-

- Register a Player -

-

To enable an existing member {% if not office %}the {{section}} section{% endif %} to - access this app, please choose - "Register a Player" from the side menu.

+ + {% if messages %} + {% for message in messages %} + {% with message.level as level %} + {% if level == 40 %} + + {% elif level == 30 %} + + {% elif level == 25 %} + + {% else %} + + {% endif %} + {% endwith %} + {% endfor %} + {% endif %} +
+
+ + {% if rota_manager or office %} +
+
+
+

+ Register a Player +

+

To enable an existing member {% if not office %}the {{section}} section{% endif %} + to + access this app, please choose + "Register a Player" from the side menu.

+
+
+
+ {% endif %}
- - {% endif %} - - {% endblock %} \ No newline at end of file diff --git a/string_rota/templates/string_rota/rota.html b/string_rota/templates/string_rota/rota.html index b44344e..b195a2f 100644 --- a/string_rota/templates/string_rota/rota.html +++ b/string_rota/templates/string_rota/rota.html @@ -45,195 +45,216 @@

Repertoire

+
+ {% if messages %} - - {% endif %} -
-
- -
-
-
-

- Seating Plan for {{seating_plan.section}} Section - Status: - {{seating_plan.get_plan_status_display}} -

-

This project - needs {{ strength }} players.

- {% if not rota_manager %} - {% if seating_plan.get_plan_status_display == "Draft" %} -

The Seating Plan for {{ project.name }} is not ready yet.

-
Please contact your Rota Manager
+ + {% else %} + + {% endif %} + {% endwith %} + {% endfor %} + {% endif %} +
+
+ +
+
+
+

+ Seating Plan for {{seating_plan.section}} Section + Status: + {{seating_plan.get_plan_status_display}} +

+

This project + needs {{ strength }} players.

+ {% if not rota_manager %} + {% if seating_plan.get_plan_status_display == "Draft" %} +

The Seating Plan for {{ project.name }} is not ready yet.

+
Please contact your Rota Manager
+ {% endif %} + {% endif %} + + + + + + + + + + + + {% for position in seating_positions %} + + {% if rota_manager %} + + {% if user.is_staff %} + + {% else %} + + {% endif %} + + + {% else %} + + + + + {% endif %} + + {% endfor %} + +
NamePosition
{{position.player}} + {{position.player}} + {{position.position_number}}
{{position.player}}{{position.position_number}}
+ +
+
+
+ + + {% if user.is_authenticated %} + {% if user.is_superuser %} +
+ Add + Player to Seating Plan + Draft/Published + Allocate + Reserve + Player +
+ {% elif rota_manager %} +
+ Add + Player to Seating Plan + Draft/Published + Allocate Reserve + Player +
{% endif %} {% endif %} + - - - - - - - - - - - {% for position in seating_positions %} - - {% if rota_manager %} - - {% if user.is_staff %} - - {% else %} - - {% endif %} - - - {% else %} - - - - - {% endif %} + - {% endfor %} - -
NamePosition
{{position.player}} - {{position.player}} - {{position.position_number}}
{{position.player}}{{position.position_number}}
- -
- - - - - {% if user.is_authenticated %} - {% if user.is_superuser %} -
- Add - Player to Seating Plan - Draft/Published - Allocate - Reserve - Player -
- {% elif rota_manager %} -
- Add - Player to Seating Plan - Draft/Published - Allocate Reserve - Player -
- {% endif %} - {% endif %} - + +
+ +
+
+
+

Reserve Player

-
+
+
+ {% if reserve_player == "Not Allocated" %} + Not Allocated + {% else %} + + {% endif %} +
+
+
- -
- -
-
-
-

Reserve Player

- -
-
- {% if reserve_player == "Not Allocated" %} - Not Allocated - {% else %} - - {% endif %} -
-
-
+
+
+

Reduced Rep Player(s)

-
-
- -
-
-
-

Reduced Rep Player(s)

- -
-
- {% if players_off_reduced_rep == "Not Allocated" %} - Not Allocated - {% else %} - {% for player in players_off_reduced_rep %} -
    -
  • {{player.player}}
    • -
- {% endfor %} - {% endif %} -
-
-
+
+
+ {% if players_off_reduced_rep == "Not Allocated" %} + Not Allocated + {% else %} + {% for player in players_off_reduced_rep %} +
    +
  • {{player.player}}
    • +
+ {% endfor %} + {% endif %} +
+
+
-
-
- -
-
-
-

Players Not Available

-
-
-
    - {% for player in not_available %} -
  • - {{player.player}} -
    • - {% endfor %} -
-
+
+
+

Players Not Available

+
+
+
    + {% for player in not_available %} +
  • + {{player.player}} +
    • + {% endfor %} +
+
+
+
+
+
-
-
-
-
- + diff --git a/templates/base.html b/templates/base.html index 8d91bc6..8c12c65 100644 --- a/templates/base.html +++ b/templates/base.html @@ -238,6 +238,17 @@
{{user.first_name}} {{user.last_name}}
+ + + + + \ No newline at end of file