diff --git a/README.md b/README.md index 8262dfd..adec641 100644 --- a/README.md +++ b/README.md @@ -272,6 +272,20 @@ The following manual tests were made: - [see issue #166 here](https://github.com/mikerae/string-rota/issues/166) - [Enable Email Server #166 Testing](/readme_assets/images/testing-issue166-3.png) - [see issue #166 here](https://github.com/mikerae/string-rota/issues/166) +- [Update Sidebar and Welcome Screen #156 Testing](/readme_assets/images/testing-issue156-1.png) + - [see issue #156 here](https://github.com/mikerae/string-rota/issues/156) +- [Show sections in sidebar #156 Testing](/readme_assets/images/testing-issue156-2.png) + - [see issue #156 here](https://github.com/mikerae/string-rota/issues/156) +- [Admin/Orch Manager View Rotas #156 Testing](/readme_assets/images/testing-issue156-3.png) + - [see issue #156 here](https://github.com/mikerae/string-rota/issues/156) +- [Admin Add Seating Position View Rotas #170 Testing](/readme_assets/images/testing-issue170-1.png) + - [see issue #170 here](https://github.com/mikerae/string-rota/issues/170) +- [Admin Seating Position CRUD #170 Testing](/readme_assets/images/testing-issue170-2.png) + - [see issue #170 here](https://github.com/mikerae/string-rota/issues/170) +- [Admin Toggle Draft/Published Rotas #170 Testing](/readme_assets/images/testing-issue170-3.png) + - [see issue #170 here](https://github.com/mikerae/string-rota/issues/170) +- [Admin Allocate Reserve Player #170 Testing](/readme_assets/images/testing-issue170-4.png) + - [see issue #170 here](https://github.com/mikerae/string-rota/issues/170) #### 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-issue156-1.png b/readme_assets/images/testing-issue156-1.png new file mode 100644 index 0000000..4aa8536 Binary files /dev/null and b/readme_assets/images/testing-issue156-1.png differ diff --git a/readme_assets/images/testing-issue156-2.png b/readme_assets/images/testing-issue156-2.png new file mode 100644 index 0000000..3d2f47a Binary files /dev/null and b/readme_assets/images/testing-issue156-2.png differ diff --git a/readme_assets/images/testing-issue156-3.png b/readme_assets/images/testing-issue156-3.png new file mode 100644 index 0000000..2a1574c Binary files /dev/null and b/readme_assets/images/testing-issue156-3.png differ diff --git a/readme_assets/images/testing-issue170-1.png b/readme_assets/images/testing-issue170-1.png new file mode 100644 index 0000000..7736fab Binary files /dev/null and b/readme_assets/images/testing-issue170-1.png differ diff --git a/readme_assets/images/testing-issue170-2.png b/readme_assets/images/testing-issue170-2.png new file mode 100644 index 0000000..f4c2c49 Binary files /dev/null and b/readme_assets/images/testing-issue170-2.png differ diff --git a/readme_assets/images/testing-issue170-3.png b/readme_assets/images/testing-issue170-3.png new file mode 100644 index 0000000..21f3f8d Binary files /dev/null and b/readme_assets/images/testing-issue170-3.png differ diff --git a/readme_assets/images/testing-issue170-4.png b/readme_assets/images/testing-issue170-4.png new file mode 100644 index 0000000..3a0bed3 Binary files /dev/null and b/readme_assets/images/testing-issue170-4.png differ diff --git a/string_rota/templates/string_rota/add_sp.html b/string_rota/templates/string_rota/add_sp.html index 9a7c6ef..dde725f 100644 --- a/string_rota/templates/string_rota/add_sp.html +++ b/string_rota/templates/string_rota/add_sp.html @@ -32,8 +32,13 @@

Add Seating Position

{{player_project_form|crispy }}
+ {% if user.is_staff %} + + Cancel + {% else %} Cancel + {% endif %}
diff --git a/string_rota/templates/string_rota/edit_sp.html b/string_rota/templates/string_rota/edit_sp.html index ab42a59..e7b8e3d 100644 --- a/string_rota/templates/string_rota/edit_sp.html +++ b/string_rota/templates/string_rota/edit_sp.html @@ -36,10 +36,18 @@

Edit Seating Position for {{player}} {{player_project_form | crispy }}
+ {% if user.is_staff %} + + Cancel + + Delete + {% else %} Cancel Delete + {% endif %} +
diff --git a/string_rota/templates/string_rota/home.html b/string_rota/templates/string_rota/home.html index 547ff20..2f3e6c3 100644 --- a/string_rota/templates/string_rota/home.html +++ b/string_rota/templates/string_rota/home.html @@ -17,38 +17,23 @@

Welcome {{user.first_name}}!

- {% if office %} -
-
-
-

- Site Under Construction! -

-

We are very sorry, but the site is currently under construction for the Orchestra Managers - and those with super-user status. - To visit the Admin part of the site, please click on the Admin menu item in the side bar. - There is full functionality for Rota Managers and Players. We will inform you when this part of the site - is ready for use. In the mean time, thank you for your patience. -

-
-
-
- {% else %}
-

Select a Project

+

Select a Project {% if office %}and a Section{% endif %} to see your required + Rota

-

Choose a project from the list of projects in the side menu to view a rota for that project.

+

Choose a project from the list of projects in the side menu {% if office %}, then choose a section + from the drop-down menu {% endif %}to view a rota for that project{% if office %} and + section{% endif %}.

- {% endif %}
diff --git a/string_rota/templates/string_rota/reserve.html b/string_rota/templates/string_rota/reserve.html index 27c8a8e..9b1766a 100644 --- a/string_rota/templates/string_rota/reserve.html +++ b/string_rota/templates/string_rota/reserve.html @@ -8,7 +8,7 @@
-

Edit Player Info for {{section}} Section for the {{project.name}}

+

Edit Player Reserve Allocation for {{section}} Section for the {{project.name}}