diff --git a/SocialHelper/SocialHelper/__pycache__/settings.cpython-38.pyc b/SocialHelper/SocialHelper/__pycache__/settings.cpython-38.pyc index e391081..4395923 100644 Binary files a/SocialHelper/SocialHelper/__pycache__/settings.cpython-38.pyc and b/SocialHelper/SocialHelper/__pycache__/settings.cpython-38.pyc differ diff --git a/SocialHelper/SocialHelper/settings.py b/SocialHelper/SocialHelper/settings.py index 70f48eb..62c0d53 100644 --- a/SocialHelper/SocialHelper/settings.py +++ b/SocialHelper/SocialHelper/settings.py @@ -77,7 +77,7 @@ WSGI_APPLICATION = 'SocialHelper.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'socialhelperdb', + 'NAME': 'postgres', 'USER': 'postgres', 'PASSWORD': 'admin', 'HOST': 'localhost' diff --git a/SocialHelper/homepage/__pycache__/admin.cpython-38.pyc b/SocialHelper/homepage/__pycache__/admin.cpython-38.pyc index e0f8f48..16c544c 100644 Binary files a/SocialHelper/homepage/__pycache__/admin.cpython-38.pyc and b/SocialHelper/homepage/__pycache__/admin.cpython-38.pyc differ diff --git a/SocialHelper/homepage/__pycache__/models.cpython-38.pyc b/SocialHelper/homepage/__pycache__/models.cpython-38.pyc index abfcd84..f8f3775 100644 Binary files a/SocialHelper/homepage/__pycache__/models.cpython-38.pyc and b/SocialHelper/homepage/__pycache__/models.cpython-38.pyc differ diff --git a/SocialHelper/homepage/__pycache__/urls.cpython-38.pyc b/SocialHelper/homepage/__pycache__/urls.cpython-38.pyc index 10dbae1..429b07b 100644 Binary files a/SocialHelper/homepage/__pycache__/urls.cpython-38.pyc and b/SocialHelper/homepage/__pycache__/urls.cpython-38.pyc differ diff --git a/SocialHelper/homepage/__pycache__/views.cpython-38.pyc b/SocialHelper/homepage/__pycache__/views.cpython-38.pyc index f3a740c..1fb9067 100644 Binary files a/SocialHelper/homepage/__pycache__/views.cpython-38.pyc and b/SocialHelper/homepage/__pycache__/views.cpython-38.pyc differ diff --git a/SocialHelper/homepage/migrations/0002_product_wolontatriat.py b/SocialHelper/homepage/migrations/0002_product_wolontatriat.py index cbeedca..1955fd1 100644 --- a/SocialHelper/homepage/migrations/0002_product_wolontatriat.py +++ b/SocialHelper/homepage/migrations/0002_product_wolontatriat.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( model_name='product', - name='Wolontatriat', + name='Wolontariat', field=models.BooleanField(default=False), ), ] diff --git a/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-38.pyc b/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-38.pyc index defb016..d0d8b48 100644 Binary files a/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-38.pyc and b/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/SocialHelper/homepage/migrations/__pycache__/0002_product_wolontatriat.cpython-38.pyc b/SocialHelper/homepage/migrations/__pycache__/0002_product_wolontatriat.cpython-38.pyc new file mode 100644 index 0000000..ef50b8c Binary files /dev/null and b/SocialHelper/homepage/migrations/__pycache__/0002_product_wolontatriat.cpython-38.pyc differ diff --git a/SocialHelper/homepage/migrations/__pycache__/0003_places.cpython-38.pyc b/SocialHelper/homepage/migrations/__pycache__/0003_places.cpython-38.pyc new file mode 100644 index 0000000..e1307a7 Binary files /dev/null and b/SocialHelper/homepage/migrations/__pycache__/0003_places.cpython-38.pyc differ diff --git a/SocialHelper/homepage/migrations/__pycache__/0004_ocena.cpython-38.pyc b/SocialHelper/homepage/migrations/__pycache__/0004_ocena.cpython-38.pyc new file mode 100644 index 0000000..85bf53a Binary files /dev/null and b/SocialHelper/homepage/migrations/__pycache__/0004_ocena.cpython-38.pyc differ diff --git a/SocialHelper/homepage/templates/homepage/index.html b/SocialHelper/homepage/templates/homepage/index.html index af42210..391acd0 100644 --- a/SocialHelper/homepage/templates/homepage/index.html +++ b/SocialHelper/homepage/templates/homepage/index.html @@ -153,6 +153,17 @@ + + diff --git a/SocialHelper/homepage/views.py b/SocialHelper/homepage/views.py index 924c675..934cd59 100644 --- a/SocialHelper/homepage/views.py +++ b/SocialHelper/homepage/views.py @@ -123,6 +123,7 @@ def filter(request): potrzebuje_local = request.POST['Potrzebuje'] usluga_local = request.POST['usluga'] przedmiot_local = request.POST['przedmiot'] + if place_local != "": all_product = all_product.filter(place=place_local) @@ -141,7 +142,7 @@ def filter(request): if usluga_local != "on" and przedmiot_local == "on": zmienna = 2 - all_product = all_product.filter(type=zmienna) + all_product = all_product.filter(type=zmienna)z types = TYPE_T