From 8512818192547fd9b1d46beb4fa9e98056ab405f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alicja=20Ci=C4=99ciwa?= <alicja.cieciwa@gmail.com>
Date: Fri, 13 Nov 2020 17:13:14 +0100
Subject: [PATCH] inputhoursform works with postresql db

---
 .idea/workspace.xml                    |  30 +--------
 templates/inputhours.html              |   3 +-
 work/__pycache__/forms.cpython-38.pyc  | Bin 1099 -> 1531 bytes
 work/__pycache__/models.cpython-38.pyc | Bin 520 -> 520 bytes
 work/__pycache__/views.cpython-38.pyc  | Bin 586 -> 650 bytes
 work/forms.py                          |  82 ++++++++++++++++++-------
 work/views.py                          |  13 +++-
 7 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 84d4345..fa1136b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="15f590a5-5017-44f1-a85e-17dfe3fc5379" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2-2.8.6.dist-info/INSTALLER" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2-2.8.6.dist-info/LICENSE" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2-2.8.6.dist-info/METADATA" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2-2.8.6.dist-info/RECORD" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2-2.8.6.dist-info/REQUESTED" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2-2.8.6.dist-info/WHEEL" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2-2.8.6.dist-info/top_level.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/_ipaddress.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/_json.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/_lru_cache.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/_psycopg.cp38-win32.pyd" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/_range.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/compat.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/errorcodes.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/errors.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/extensions.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/extras.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/pool.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/sql.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Lib/site-packages/psycopg2/tz.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/migrations/0001_initial.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/migrations/0002_hoursinput_date.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/migrations/__init__.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/settings.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/models.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/inputhours.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/inputhours.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/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/views.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
diff --git a/templates/inputhours.html b/templates/inputhours.html
index ced9197..3045fc8 100644
--- a/templates/inputhours.html
+++ b/templates/inputhours.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
+{% load crispy_forms_tags %}
 
 <div class="container">
     <div class="row">
@@ -15,7 +16,7 @@
       <div class="form-hours">
         <form method="post">
           {% csrf_token %}
-          {{ form.as_p }}
+          {{ form | crispy}}
           <button class="btn btn-lg btn-success btn-block" type="submit">Dodaj</button>
         </form>
       </div>
diff --git a/work/__pycache__/forms.cpython-38.pyc b/work/__pycache__/forms.cpython-38.pyc
index 85808b006fe7638b85ebd9eabb3a977982915d9c..d3de530fc0228ace8b3cecf060db625a4e0fd98d 100644
GIT binary patch
literal 1531
zcmZux&2Jnv6t_K|*_qwhZTf)<2&DA52v)!mMOCXLr4db1(N>YHMWe~syP2(LXJgN@
zWECzXsHbwT;EdD@;><buCwxPk_!j^H&z?=Qd|2|E_vQDVpMP(jwA)Pt>(-AyBtHZ9
zixrj^1>p{C&46&ku|x%C7+ao5Qh3aByeDblGvD!421USvqQM$Y_GMT^ECN1Y&5sdp
z@bDDzP~cH?;;|Nw9-(gYSBQ_g*!Y7|6&jf4{c@`G)_5|lKw5buq{ym`v=VzcABw6=
zOvpj1@<JGDIq-_MOD^O+h|neAfInbfxwC1x51IFPZ#T0^mY25>^gF-^#4tyUK#7<W
zD3P2H<~>6L%soy|Lq?w=ikJ`O`lfSPp3V2ak?%lI{pM0+;W27sb8qM|pHmxYe*K@3
zdfTE(RRE_<d|+FUjHkuEP$rs{>ghzLnb_$DCQOoXT8Jbu%_J#GK9!b_ljLxk%G#pr
z?TimbAx$vIh2;7rQrAH1$Zx&%kNQuvP`ZCt=GiFiZ-~$PgIpEqd-_OMqUhU{efJ{0
z$&sP9w0GgSwy+2>#p(ty83uB(ti^|Y1-AYkNQEkVj84di9OGm14M3;zMijPRcj7z3
z>2u6|9^{xeo|9uV3OHG_UJckG4|xQZ+NZhX({er$_%y*Me&y3%^69K0eq{rF_STmk
zM>g`Y_XbK@eB~7%AD(gq?{Ia8Q9xJSc|c6db^4%`99mDSqlv|rpH`L9CRE~Znk&Jl
zH{pU0OP-EaXXjs~=ig@e?Ck4RK;zj9h!M;jR82=HRjQ;ATBk#y)oXBS-hPm0^Zj&n
zSn_#3p1uycy@@JkDL?;d6`o_hfA(TwR4sR4I~OCJiPecpvm=-K@<6d{Q!)5=JqIFp
z)+r3?wvDf+6R5@xy@gOd&Z{I*#EKDIU)-}OsaZFA>Z&!xTjNR$g{rNs9S2BfH_`e*
zy3j|D#TV5=dm!W_sX#WqO!tNCQbV<n14C0a)Fya3b6?+~@+C}el4LT~8j5lFybfvA
z+d$rjt#1QC_!<C?VuHz^p-&L`i~JskP6K>Eo#v0Y@gGeX;uz0w{%guE?%oYl8-lBj
zB^I;}(k``WFN(^9loy4$>g?Y_xe{$7tyE70=}_0&oo;LbK1#>KvhHom4pPreqOQmC
zMs4oZ!&L)CD?2^Pj*ojg7B4%g2I$$!-tMQLJbZ9>eKT3Vzq_@*=@MQJ^=11^xK{rc
UZrl0P785a!NsL!;?9p3)1HAr++W-In

literal 1099
zcmYjPQBTxB5bn0yUVGPrL-_%icn^I5qmRZI$N@^!!w7`fT+)=za`fD`$8IZf@l9X(
z2Ry)|@vry`_SGkTf}+vcmISuh={K|A%<Rt0Ubovea9uz69{sQl<EK{cE{e)3ZaG8&
z1`uv!BqT&*lbe|pS~a#f&1gt7JG5(^awltrEyQ-{zA(Un)>i{sj7+>QR@er2#|XSD
zjA;Z!*@uP5B!b=!<18uH<C5*CFlJ?7Di=^I(~K#q5wg5D1u(veK7ok@@;J1L;f6*}
zLTh(_JJDh9E*F(m-10LDW`qQc&}7zx0vQwh+hBsloQu|_ap3~JBw(Lg;G7X?fqQ0!
z9&*}vd27-E58BW{zJE?@Mi=H_{)~n`o_1@_9CA$P!NN@p5AI=%dAN^HUQ}~0i%Q6?
zd|H+I1v9q~kNVl8{`;A)tFW9Dc_|7muo;FvT<&Mf{r7>T?1aZsDq5aSnX*5|ywbI>
z<FXV|8A#}+I%uS$#HCcuNnJr@^Z0=AUFGCecEH4}`#Mc#2l3LlfLWRcRJnp3SE*ni
zI+#;+raVsAQNe);p@%~d6j$>o0xA}?p@%|wS(-=nH4w(18aV5|N!dguY-uXu<P>k^
z#Z_4x7D*+WV2e7AbsI<AN5e4aDL0DpIAc+y+EJ7hP;rg@C_1iU-kb<iC+_O;*u{a^
zOc{q;wXUhq1FNjOI8m-F#i1UYx|Yh{%1bt8qVehs>uS_Kp?{=%5;X-<-ry*{VR^gk
zQ`vC5lR|u`OY_YT4>3tCey<Fkj`k!Ia<s<NWD<|o*~iggiY-`{r?O<(Nc)X+Q{>9@
zRCwq)hg&{D;SySZCNYWs*R{=GPMacjiD{VsTodirj(cO#`k&f=7<7~alQ<t2O+^+P
zWu?i|^j!)|Us9K&et+oSB?$-ZVQ+u?-K)2+*9IHW;N|w#U_;SOyl9=|_Kgkdql0pv
UHH~?$M?&i1@J*leh;LEnKZh147XSbN

diff --git a/work/__pycache__/models.cpython-38.pyc b/work/__pycache__/models.cpython-38.pyc
index e23c838cdad534b8de0b70368ef2c0c0c6c84554..698e9a41a369d75ab179e0a3cc7390c663c6626c 100644
GIT binary patch
delta 19
ZcmeBR>0sds<>lpK0D_ze8@c{50sti81X2J1

delta 19
YcmeBR>0sds<>lpK00QN_ja>g20V06|=Kufz

diff --git a/work/__pycache__/views.cpython-38.pyc b/work/__pycache__/views.cpython-38.pyc
index 5f53c20c792b8c22b11e9e3391c3b89010ffaec9..74362651ace38f958d3997d7b0ccc61cf5f1d582 100644
GIT binary patch
delta 426
zcmYjOy-or_5T4olTTVEQg_VU`d6-yGSr{7){uF3}HZ+LrsmL9Ny9Y{g!~!cjLTe$V
zjlPGEaD@+I<t&=$Oy--NZ+B-VGau%Y<((A@E|BEk-|7Qn>@DNocw>DPgc;hAQ*#gm
z2rJ|@E^OgELM<n(D)@YSUVLy5;+|B8oo+AjG4uYSax9}t6LsESG059wyJYH!K)?`F
zxB-D}CQFGvvk?wi%3h2q$Sv~b6c7?i5MPCko!|(DEU{A%M#@qYi{>*M8Ptqb$;^}E
z>gg9wmT;}?WOfuJ*RhZm6_UDa##^f1Z-gz8nX1tbB-1y#Dc{H(8Qk^)mB^eXIl(JP
zZ*q_OD>_gM1b`;Gq#U{9GMh<F`tIZtix+cuv21Tfu?RvXP2y|rjJc#Ks96sg@2WvF
h?p~E<|D;Ec{=qzj8Q-Q1y)f9(V^ex3dHhjsd;@IVT_FGf

delta 339
zcmY+9&q~8U5XN^ln@vcXco#wNWFy!<fQa<qpGy_1mtIQgM*1&}PBsdXp5m#u(1RBb
zdK7#FpTIXT4<pXv$r<>u-#5%R?8^QU;dKyrjB3^S7<@w&Zb7@++YN-WpIBci*<($o
z($PkEn&z0DEpBstoMKXaZjL&%reFyLn=-{`93ySsyo4n$_^b8Cu&sr%O6akL)KIb|
z*LJ~_D0l(Ne&MA>@v__ZFXL&PX&jEG!&+RN_pTmgYn&$Wx&=E&vX)7#$EiX=7ttov
z?j#%B59bqw+;|qDY1IzKcex32j42844E^;poNODBg#-oyJZcv_E;$C|beqol2cnMm
jkm79rhQ62moiao8|D!>&b`O$N<@5LuNM$Cw0o2wn3H?m?

diff --git a/work/forms.py b/work/forms.py
index 323efdb..edac06d 100644
--- a/work/forms.py
+++ b/work/forms.py
@@ -1,4 +1,5 @@
 from django import forms
+from work.models import HoursInput
 # from django.forms import extras
 from django.forms.widgets import SelectDateWidget
 from datetime import datetime, date
@@ -10,32 +11,69 @@ WORKPLACE_CHOICE =(
     ("2", "TWO")
 )
 
+
 # base form to input the number of hours
-class HoursInputForm(forms.Form):
-    date = forms.DateTimeField(
-        input_formats=['%d/%m/%Y'],
-        widget=forms.DateTimeInput(attrs={
-            'class': 'form-control',
-            'type': 'date',
-            'value': datetime.now().strftime("%d-%m-%Y")
+# class HoursInputForm(forms.Form):
+#     date = forms.DateField(
+#         # input_formats=['%d.%m.%Y'],
+#         widget=forms.DateInput(attrs={
+#             'class': 'form-control',
+#             'type': 'date',
+#             # 'value': datetime.now().strftime("%d-%m-%Y")
+#             }),
+#         label="")
+#
+#     hours_number = forms.IntegerField(
+#         label="",
+#         widget=forms.NumberInput(attrs={'required': True, 'type': 'number',
+#                                         'placeholder': 'Liczba godzin', 'class': 'form-control'} ),
+#         min_value=0,
+#         max_value=15
+#     )
+#
+#     workplace = forms.CharField(
+#         label="",
+#         widget=forms.TextInput(attrs={'autofocus': True, 'class': 'form-control',
+#                                 'placeholder': 'Miejsce pracy'}),
+#         required=True
+#     )
+
+
+class HoursInputForm(forms.ModelForm):
+
+    class Meta:
+        model = HoursInput
+        fields = ['date', 'hours_number', 'workplace']
+
+    def __init__(self, *args, **kwargs):
+        super(HoursInputForm, self).__init__(*args, **kwargs)
+        self.fields['date'] = forms.DateField(
+            widget=forms.DateInput(attrs={
+                'placeholder': 'Data',
+                'type': 'date',
             }),
-        label="",
-    )
+            error_messages={
+                'required': 'Podaj właściwą datę',
+            })
+        self.fields['hours_number'] = forms.IntegerField(
+            widget=forms.NumberInput(attrs={
+                'placeholder': 'Liczba godzin'
+            }),
+            error_messages={
+                'required': 'Wprowadź liczbę godzin',
+            })
+        self.fields['workplace'] = forms.CharField(
+            widget=forms.TextInput(attrs={
+                'placeholder': 'Miejsce pracy'
+            }),
+            error_messages={
+                'required': 'Wprowadź miejsce pracy',
+            })
 
-    hours_number = forms.IntegerField(
-        label="",
-        widget=forms.NumberInput(attrs={'required': True, 'type': 'number',
-                                        'placeholder': 'Liczba godzin', 'class': 'form-control'} ),
-        min_value = 0,
-        max_value = 15
-    )
+        for field in ['date', 'hours_number', 'workplace']:
+            self.fields[field].help_text = None
+            self.fields[field].label = ''
 
-    workplace = forms.CharField(
-        label="",
-        widget=forms.TextInput(attrs={'autofocus': True, 'class': 'form-control',
-                                'placeholder': 'Miejsce pracy'}),
-        required=True
-    )
 # class HoursInputForm(ModelForm):
 #     class Meta:
 #         model = HoursInput
diff --git a/work/views.py b/work/views.py
index f77f02a..a232163 100644
--- a/work/views.py
+++ b/work/views.py
@@ -1,14 +1,23 @@
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
+from work.models import HoursInput
 from work.forms import HoursInputForm
+import psycopg2
 
 
 def get_basic_workdata(request):
-    title = 'Rejestracja'
+    title = None
     if request.method == 'POST':
         form = HoursInputForm(request.POST)
         if form.is_valid():
-            return HttpResponseRedirect('/home/')
+            form.save()
+            # form.date = request.POST.get('date')
+            # form.hours_number = request.POST.get('hours_number')
+            # form.workplace = request.POST.get('workplace')
+            # date = form.cleaned_data['date']
+            # hours_number = form.cleaned_data['hours_number']
+            # workplace = form.cleaned_data['workplace']
+            return HttpResponseRedirect('/')
     else:
         form = HoursInputForm()