From 1e0e208f77b050d3a5c050c5e54482989cacaac8 Mon Sep 17 00:00:00 2001 From: Mike Rae Date: Thu, 12 Oct 2023 10:22:45 +0000 Subject: [PATCH] [#176] Update Messages Add boilerplate Bootstrap Alerts to home.html and rota.html modified: string_rota/templates/string_rota/home.html modified: string_rota/templates/string_rota/rota.html Add Boostrap JS links to the bottom of base.html modified: templates/base.html Add testing of Update Messages to README modified: README.md new file: readme_assets/images/testing-issue176.png --- README.md | 2 + readme_assets/images/testing-issue176.png | Bin 0 -> 20620 bytes string_rota/templates/string_rota/home.html | 94 +++-- string_rota/templates/string_rota/rota.html | 367 +++++++++++--------- templates/base.html | 11 + 5 files changed, 263 insertions(+), 211 deletions(-) create mode 100644 readme_assets/images/testing-issue176.png 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 0000000000000000000000000000000000000000..507145593dc6c212cf0db7d9826bab5cf7650b0b GIT binary patch literal 20620 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 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 %} -
    - {% for message in messages %} - {% with message.level as level %} -
  • - {% if level == 40 %} - {{ message }} - {% elif level == 30 %} - {{ message }} + {% for message in messages %} + {% with message.level as level %} + {% if level == 40 %} + + {% elif level == 30 %} + {% elif level == 25 %} - {{ message }} - {% else %} - {{ message }} - {% 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
+ + {% 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