diff --git a/bibrecognition/imguploader/__pycache__/forms.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/forms.cpython-38.pyc index f31c41f..d0c0a28 100644 Binary files a/bibrecognition/imguploader/__pycache__/forms.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/forms.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/functions.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/functions.cpython-38.pyc new file mode 100644 index 0000000..819f739 Binary files /dev/null and b/bibrecognition/imguploader/__pycache__/functions.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/models.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/models.cpython-38.pyc index 308d83f..c6457be 100644 Binary files a/bibrecognition/imguploader/__pycache__/models.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/models.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc index 1430f17..01e1fdc 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/forms.py b/bibrecognition/imguploader/forms.py index 79f447b..330a1d6 100644 --- a/bibrecognition/imguploader/forms.py +++ b/bibrecognition/imguploader/forms.py @@ -3,5 +3,7 @@ from django import forms from .models import * class PhotoForm(forms.Form): - zawody = forms.CharField(max_length=50) - file_field = forms.FileField(widget=forms.ClearableFileInput()) + zawody = forms.ModelChoiceField( + queryset=Competitions.objects.all(), to_field_name="comp_slug") + file_field = forms.FileField( + widget=forms.ClearableFileInput(attrs={'multiple': True})) diff --git a/bibrecognition/imguploader/models.py b/bibrecognition/imguploader/models.py index 57dc232..d11199f 100644 --- a/bibrecognition/imguploader/models.py +++ b/bibrecognition/imguploader/models.py @@ -1,16 +1,25 @@ from django.db import models +class PhotoManager(models.Manager): + def create_photo(self, comp_id, name, image, url): + photo = self.create(comp_id = comp_id, name = name, image = image, url = url) + + return photo # Create your models here. class Competitions(models.Model): comp_slug = models.CharField(max_length=100) comp_name = models.CharField(max_length=100) status = models.CharField(max_length=10, default="draft") + def __str__(self): + return self.comp_name + class Photo(models.Model): comp_id = models.ForeignKey(Competitions, on_delete=models.CASCADE) name = models.CharField(max_length=100, default='Zdjecie') image = models.ImageField(upload_to='images/', default='placeholder.jpg') url = models.CharField(max_length=50) + objects = PhotoManager() class PhotoMeta(models.Model): photo_id = models.ForeignKey(Photo, on_delete=models.CASCADE) diff --git a/bibrecognition/imguploader/views.py b/bibrecognition/imguploader/views.py index 1f1fea1..778f59f 100644 --- a/bibrecognition/imguploader/views.py +++ b/bibrecognition/imguploader/views.py @@ -3,6 +3,11 @@ from django.http import HttpResponse from .forms import PhotoForm from django.http import HttpResponseRedirect +from .models import PhotoManager +from .models import Photo + +# from .functions import test + # Create your views here. def index(request): @@ -13,11 +18,17 @@ def index(request): def uploadPhotos(request): if request.method == 'POST': form = PhotoForm(request.POST, request.FILES) + files = request.FILES.getlist('file_field') if form.is_valid(): - - form.save() - # return render(request, print(request.FILES['file_field'])) + for f in files: + photo = Photo.objects.create_photo(1,f,f,'test') + # return self.form_valid(form) return HttpResponseRedirect('/success/url/') + else: + # return self.form_invalid(form) + # form.save() + # return render(request, print(request.FILES['file_field'])) + return HttpResponseRedirect('/faild/url/') else: form = PhotoForm() return render(request, 'upload.html', {'form': form})