diff --git a/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc index c51b4be..21cf05c 100644 Binary files a/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc index 04e9881..95c2ce1 100644 Binary files a/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/templates/change.html b/bibrecognition/imguploader/templates/change.html index 1cc9000..9f9aa68 100644 --- a/bibrecognition/imguploader/templates/change.html +++ b/bibrecognition/imguploader/templates/change.html @@ -6,13 +6,76 @@ Search Photos + {% if form %}
{% csrf_token %} {{ form }} - +
{% endif %} {% if meta %} @@ -23,6 +86,8 @@ {% for nr in n.1 %}

{{ nr }}

{% endfor %} + Zmień + {% endfor %} diff --git a/bibrecognition/imguploader/templates/changeid.html b/bibrecognition/imguploader/templates/changeid.html index 7456b8a..0633c4a 100644 --- a/bibrecognition/imguploader/templates/changeid.html +++ b/bibrecognition/imguploader/templates/changeid.html @@ -6,24 +6,108 @@ Search Photos + {% if foto %} - -

Znalezione wartości:

- - {% for n in numery %} - {{ n }}, - {% endfor %} -

Nowe wartości (po przecinku):

-
- {% csrf_token %} - {{ form }} - -
+
+ + +

Znalezione wartości:

+ + {% for n in numery %} + {{ n }}, + {% endfor %} + +

Nowe wartości (po przecinku):

+
+ {% csrf_token %} + {{ form }} + +
+
- {% endif %} diff --git a/bibrecognition/imguploader/templates/failed.html b/bibrecognition/imguploader/templates/failed.html new file mode 100644 index 0000000..34a9a59 --- /dev/null +++ b/bibrecognition/imguploader/templates/failed.html @@ -0,0 +1,51 @@ + + + + + + + Search Photos + + + + +
+

Bład

+ Wróć do głównej +
+ + + \ No newline at end of file diff --git a/bibrecognition/imguploader/templates/index.html b/bibrecognition/imguploader/templates/index.html index 94131d0..c6819f4 100644 --- a/bibrecognition/imguploader/templates/index.html +++ b/bibrecognition/imguploader/templates/index.html @@ -5,12 +5,27 @@ RunPhoto - + + {% if user.is_authenticated %} - Zalogowany 😎
- Załaduj zdjęcia
- Przeszukaj bazę
- Koryguj +

Zalogowany 😎


+
+ Załaduj zdjęcia
+ Przeszukaj bazę
+ Koryguj +
+ {% else %} Gość 🏃‍♀️
Przeszukaj bazę diff --git a/bibrecognition/imguploader/templates/search.html b/bibrecognition/imguploader/templates/search.html index f119c11..b92a386 100644 --- a/bibrecognition/imguploader/templates/search.html +++ b/bibrecognition/imguploader/templates/search.html @@ -6,13 +6,43 @@ Search Photos + {% if form %}
{% csrf_token %} {{ form }} - +
{% endif %} {% if foto %} diff --git a/bibrecognition/imguploader/templates/sukces.html b/bibrecognition/imguploader/templates/sukces.html new file mode 100644 index 0000000..268125f --- /dev/null +++ b/bibrecognition/imguploader/templates/sukces.html @@ -0,0 +1,49 @@ + + + + + + + Search Photos + + + + +
+

Sukces

+ Wróć do głównej +
+ + + \ No newline at end of file diff --git a/bibrecognition/imguploader/templates/upload.html b/bibrecognition/imguploader/templates/upload.html index ad8c1ce..5244c77 100644 --- a/bibrecognition/imguploader/templates/upload.html +++ b/bibrecognition/imguploader/templates/upload.html @@ -5,11 +5,42 @@ Upload Photos +
{% csrf_token %} {{ form }} - +
\ No newline at end of file diff --git a/bibrecognition/imguploader/urls.py b/bibrecognition/imguploader/urls.py index fe7f252..919266a 100644 --- a/bibrecognition/imguploader/urls.py +++ b/bibrecognition/imguploader/urls.py @@ -10,6 +10,8 @@ urlpatterns = [ path('search', views.searchPhotos, name="search"), path('change', views.changePhotos, name="change"), path('change/', views.changePhotoID, name="changeid"), + path('success/', views.ss, name="ss"), + path('failed/', views.ff, name="ff"), diff --git a/bibrecognition/imguploader/views.py b/bibrecognition/imguploader/views.py index dd0f308..15ed393 100644 --- a/bibrecognition/imguploader/views.py +++ b/bibrecognition/imguploader/views.py @@ -112,6 +112,7 @@ def changePhotos(request): for numer in pm: numery.append(numer.meta_value) meta.append(numery) + meta.append(zdjecie.id) imgMeta.append(meta) return render(request, 'change.html', {'meta': imgMeta}) @@ -160,3 +161,12 @@ def changePhotoID(request, photo): return HttpResponseRedirect('/failed/') return render(request, 'changeid.html', {'photoid':photo,'foto': foto, 'numery': numery, 'form': form}) + +def ss(request): + + return render(request, 'sukces.html') + + +def ff(request): + + return render(request, 'failed.html')