From b8c345a3b851b2711b451b1bbab57941e82f893c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alicja=20Ci=C4=99ciwa?= <alicja.cieciwa@gmail.com>
Date: Mon, 28 Dec 2020 23:07:31 +0100
Subject: [PATCH] table view

---
 .idea/workspace.xml                    |   9 ++++-----
 config/__pycache__/urls.cpython-38.pyc | Bin 1405 -> 1464 bytes
 config/urls.py                         |   3 ++-
 static/css/main.css                    |  11 ++++++++++-
 templates/addworkplace.html            |   6 +-----
 templates/base.html                    |   2 +-
 templates/workplaces.html              |  26 +++++++++++++++++++++++++
 work/__pycache__/views.cpython-38.pyc  | Bin 1004 -> 1242 bytes
 work/views.py                          |   9 ++++++++-
 9 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 templates/workplaces.html

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 06e9d10..26f8b26 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="15f590a5-5017-44f1-a85e-17dfe3fc5379" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/templates/addworkplace.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/migrations/0003_auto_20201228_1744.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/migrations/0004_workplaceinput.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/templates/workplaces.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/urls.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/css/main.css" beforeDir="false" afterPath="$PROJECT_DIR$/static/css/main.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/addworkplace.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/addworkplace.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/templates/base.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/base.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/forms.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/forms.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/models.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/work/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/views.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -20,6 +18,7 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
   </component>
   <component name="ProjectId" id="1j71bSwhqpUMSNPYaQQ9lvdeSR6" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
diff --git a/config/__pycache__/urls.cpython-38.pyc b/config/__pycache__/urls.cpython-38.pyc
index 73d0fb959c6f3319bb243bf2fa1634af65f51a18..d7efedc5a1df1eaf43392f19de7fe0298e3c7c3b 100644
GIT binary patch
delta 160
zcmey%wS!wbl$V!_0SF|$Ud7k2GB7*_agYHIkmCTv#d{`duarn-NfA!v$P!5rN#W{c
zPUnacO%V-d&=lKvPlK6Ns64+Ydon+ZjAE4lh^Y@E3UU&YQ;YSZxDXsaO|i*(EH?zB
b_=_|0%i|Feli64!8D%CXu*xtq^8Ek+OA#r~

delta 100
zcmdnN{g+ESl$V!_0SG<_zKS<uWng#=;vfTVAjbiSi`PxmUdfft9wm|@9L%68vhj@u
oGpAT$a&mrYUP<v}NfsGqKTXleVJtT$+p|V8N==^0D#Q2_0OmXviU0rr

diff --git a/config/urls.py b/config/urls.py
index 12401c3..99bb6b3 100644
--- a/config/urls.py
+++ b/config/urls.py
@@ -28,5 +28,6 @@ urlpatterns = [
     path('accounts/sign_up/', accounts_views.sign_up, name='sign-up'),
     path('accounts/login/', views.LoginView.as_view(), name='login'),
     path('accounts/logout/', accounts_views.logout_view, name='logout'),
-    path('accounts/addworkplace/', work_views.addworkplace_view, name='addworkplace'),
+    path('work/addworkplace/', work_views.addworkplace_view, name='addworkplace'),
+    path('work/workplaces/', work_views.show_workplaces, name='workplaces'),
 ]
diff --git a/static/css/main.css b/static/css/main.css
index 0e28d59..dbac288 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -148,7 +148,16 @@ a.btn-logout {
     -webkit-appearance: button;
     -moz-appearance: button;
     appearance: button;
-
     text-decoration: none;
     color: #EDEDED;
+}
+
+.table-view {
+  width: 100%;
+  max-width: 420px;
+  padding: 20px;
+  margin: auto;
+  background-color: rgba(255,255,255,0.7);
+  margin-top: 150px;
+  text-align: left;
 }
\ No newline at end of file
diff --git a/templates/addworkplace.html b/templates/addworkplace.html
index 98b0f0f..8452ac6 100644
--- a/templates/addworkplace.html
+++ b/templates/addworkplace.html
@@ -3,9 +3,7 @@
 {% block content %}
 {% load crispy_forms_tags %}
 
-<!--<div class="container">-->
-<!--  form to input working hours-->
-<!--    <div class="row">-->
+<!--  form to input workplace  -->
       <div class="form-hours">
         <form method="post">
           {% csrf_token %}
@@ -13,6 +11,4 @@
           <button class="btn btn-lg btn-success btn-block" type="submit">Dodaj</button>
         </form>
       </div>
-<!--    </div>-->
-<!--</div>-->
 {% endblock %}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 097476b..e2883d6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -52,7 +52,7 @@
                             <a class="nav-link" href="{% url 'sign-up' %}">Dodaj pracownika</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="{% url 'addworkplace' %}">Dodaj pracę</a>
+                            <a class="nav-link" href="{% url 'workplaces' %}">Prace</a>
                         </li>
                         {% endif %}
                     </ul>
diff --git a/templates/workplaces.html b/templates/workplaces.html
new file mode 100644
index 0000000..e2923a9
--- /dev/null
+++ b/templates/workplaces.html
@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+
+{% block content %}
+{% load crispy_forms_tags %}
+
+<!--  Show workplaces  -->
+<div class="table-view">
+    <a href="{% url 'addworkplace' %}">+ Dodaj pracę</a> <br><br>
+
+    <table class="table">
+        <thead>
+            <tr>
+                <th scope="col">Miejsca pracy</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for wp in workplaces.all %}
+            <tr>
+                <td>{{ wp.workplace }} <br></td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/work/__pycache__/views.cpython-38.pyc b/work/__pycache__/views.cpython-38.pyc
index 3ce86178c36e6ca0672c2e68f2b9b0aefae3af39..796725511321736e301c33643ee1c0aa87d068bc 100644
GIT binary patch
delta 336
zcmaFEev6YYl$V!_0SK-Kzly)aGLcV)F=V2)yHF}y3TFye3qvzw6lV%|FoPz~#tJPa
z`CF_3MTyC&MQlJFRf78E`9;}aq96w-TC6{LGt<m^F`!&BBgjlBU<T444bDJZECVD`
z7;70z7_t~^nM#;y7*d#Om}(ePnCCDxGXpJR@hcJqs;S}!84fX5FQX(kN0aFm7ec6r
z8>mK;`4(R|OqFL|L21b?_Wa<atkmR^;v$f(n#@H4Knkq5NF2lxf)m0()-C?xjQsL=
zgt4kX!D5hG8JJiY*%*tYfGj^vuF1j732Y#L6-iCr!mK6+GKGhchmnJkhnb0yiyw%2
GnHT|^_)2I1

delta 97
zcmcb``G%b@l$V!_0SI1-zKZ|OJdsa^(PN^vJ6j58FoP!7#uhCm!6?>%qQvCXA~v9^
vA`T!i`7F~+c2OY1Pm^=91xo^>=;V1UYC?QK5gtY!Mh-?EW+p~1ekMi$aP1QH

diff --git a/work/views.py b/work/views.py
index f4d17f0..f60bcc4 100644
--- a/work/views.py
+++ b/work/views.py
@@ -27,8 +27,15 @@ def addworkplace_view(request):
         form = WorkplaceInputForm(request.POST)
         if form.is_valid():
             form.save()
-            return HttpResponseRedirect('/')
+            return HttpResponseRedirect('/work/workplaces/')
     else:
         form = WorkplaceInputForm()
 
     return render(request, 'addworkplace.html', {'form': form, 'title': title})
+
+
+@login_required
+def show_workplaces(request):
+    title = "Prace"
+    workplaces = WorkplaceInput.objects
+    return render(request, 'workplaces.html', {'workplaces': workplaces, 'title': title})
\ No newline at end of file