[Printer] Fix major bug. See below for more explanations :

Before, I used request.session to store some information about the current jobs to be printed.
This was because in the very beginning, I had an issue with disappearing files in my model.

I was able to fix this issue in a previous commit, but I still needed the jids.
However, because of this storage system, if someone tried to print a file, then oppened a second tab,
and tried to print anoter file, he/she would pay twice for the second file ....

I decided to add a hidden field to store the job id and deal with it, and it is readonly to avoid
changing it.

printer/forms.py

@@ -47,6 +47,9 @@ class JobWithOptionsForm(FormRevMixin, ModelForm):
 
 
 class PrintForm(FormRevMixin, ModelForm):
+
+    jid = forms.IntegerField(widget=forms.HiddenInput())
+
     def __init__(self, *args, **kwargs):
         prefix = kwargs.pop('prefix', self.Meta.model.__name__)
         self.user = kwargs.pop('user')
@@ -58,6 +61,7 @@ class PrintForm(FormRevMixin, ModelForm):
         self.fields['color'].label = 'color'
         self.fields['count'].label = 'count'
 
+        self.fields['jid'].widget.attrs['readonly'] = True
         self.fields['printAs'].widget.attrs['readonly'] = True
         self.fields['filename'].widget.attrs['readonly'] = True
         self.fields['price'].widget.attrs['readonly'] = True
@@ -71,4 +75,5 @@ class PrintForm(FormRevMixin, ModelForm):
             'endtime',
             'status',
             'file',
+            'paid',
             ]

printer/migrations/0009_jobwithoptions_paid.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-10-21 15:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('printer', '0008_auto_20181012_1242'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='jobwithoptions',
+            name='paid',
+            field=models.BooleanField(default='False'),
+        ),
+    ]

printer/models.py

@@ -85,6 +85,7 @@ class JobWithOptions(RevMixin, models.Model):
                 ('Finished', 'Finished')
         )
         user = models.ForeignKey('users.User', on_delete=models.PROTECT)
+        paid = models.BooleanField(default='False')
         file = models.FileField(storage=FileSystemStorage(location='/var/impressions'),
                                 upload_to=user_printing_path,
                                 validators=[FileValidator(

printer/views.py

@@ -46,23 +46,36 @@ def new_job(request):
     View to create a new printing job
     """
     if request.method == 'POST':
+        # raise Exception('coucou3')
+        # raise ValidationError("'%(path)s'", code='path', params = {'path': request.FILES})
+
         job_formset = formset_factory(JobWithOptionsForm)(
             request.POST,
             request.FILES or None,
             form_kwargs={'user': request.user},
         )
 
+        # raise ValidationError("'%(path)s'", code='path', params = {'path': request.FILES})
+
+
         tmp_job_formset = job_formset
 
         if request.FILES:
+            # raise Exception("Coucou4")
 
             if job_formset.is_valid():
+                # raise Exception("Valide !!!")
                 files = request.FILES
                 data = []
                 i=0
-                for job in job_formset:
+                # request.POST['jids'] = []
-                    # raise ValidationError("'%(path)s'", code='path', params = {'path': job.cleaned_data["file"].name})
+                jids = []
+                for job in job_formset.forms:
+                    if job.is_valid():
+                        try:
                             filename = job.cleaned_data['file'].name
+                        except KeyError:
+                            raise ValidationError("'%(path)s'", code='path', params = {'path': job})
                         job = job.save(commit=False)
                         job.filename = filename
                         job.user=request.user
@@ -85,15 +98,21 @@ def new_job(request):
                         job._update_price()
                         job.save()
                         job_data = model_to_dict(job)
-                    request.session['id-form-%s-file' % i] = job.id
+                        jids.append(job.id)
-                    request.session['form-%s-file' % i] = request.FILES['form-%s-file' % i].temporary_file_path()
+                        # request.session['id-form-%s-file' % i] = job.id
-                    # raise ValidationError("'%(plop)s'", code='plop', params = {'plop': job_data })
+                        # request.session['form-%s-file' % i] = request.FILES['form-%s-file' % i].temporary_file_path()
+                        job_data['jid'] = job.id
                         data.append(job_data)
                         i+=1
                 job_formset_filled_in = formset_factory(PrintForm, extra=0)(
                     initial=data,
-                    form_kwargs={'user': request.user},
+                    # jids=jids,
+                    form_kwargs={'user': request.user,
+                    },
                 )
+                # raise ValidationError("'%(path)s'", code='path', params = {'path': job_formset_filled_in.forms })
+
+                # request.POST['job_ids'] = jids
                 return form(
                     {
                         'jobform': job_formset_filled_in,
@@ -102,40 +121,70 @@ def new_job(request):
                     'printer/print.html',
                     request
                 )
+            else:
+                job_formset = tmp_job_formset
+                return form(
+                    {
+                        'jobform': job_formset,
+                        'action_name': _("Next"),
+                    },
+                    'printer/newjob.html',
+                    request
+                )
 
+        # else:
+        #     job_formset = tmp_job_formset
+        #     return form(
+        #         {
+        #             'jobform': job_formset,
+        #             'action_name': _("Next"),
+        #         },
+        #         'printer/newjob.html',
+        #         request
+        #     )
+
+
+    # else:
+    #     raise Exception("Coucou5")
         # elif 'Print' in request.POST:
         # raise ValidationError("'%(path)s'", code='path', params = {'path': request.POST })
 
         # raise Exception('On a déjà upload !')
-        n = int(request.POST['form-TOTAL_FORMS'])
+        # n = int(request.POST['form-TOTAL_FORMS'])
         job_formset = formset_factory(PrintForm)(
             request.POST,
             form_kwargs={'user': request.user},
         )
-        jids = [request.session['id-form-%s-file' % i] for i in range(n)]
+        # raise ValidationError("'%(path)s'", code='path', params = {'path': request.POST })
-        # raise ValidationError("'%(path)s'", code='path', params = {'path': id_list })
+        # jids = request.POST['job_ids']
         if job_formset.is_valid():
-            for job_obj in job_formset:
+            for job_form in job_formset:
                 i=0
-                old_job = JobWithOptions.objects.get(id=jids[i])
+                # old_job = JobWithOptions.objects.get(id=jids[i])
-                job = job_obj.save(commit=False)
+                jid = job_form.cleaned_data['jid']
+                # raise ValidationError("'%(path)s'", code='path', params = {'path': job_obj.cleaned_data })
+                job = JobWithOptions.objects.get(id=jid)
+                # job = job_obj.save(commit=False)
                 job.user = request.user
                 job.status = 'Printable'
-                job.file = old_job.file
+                # raise ValidationError("'%(plop)s'", code='plop', params = {'plop': job.file})
+                # job.file = old_job.file
                 job._update_price()
                 job.save()
                 i+=1
                 # raise ValidationError("'%(plop)s'", code='plop', params = {'plop': request.method})
                 # raise ValidationError("'%(path)s'", code='path', params = {'path': str(n) })
-            request.session['jids']=jids
+            # request.session['jids']=jids
             return redirect('printer:payment')
 
-        job_formset = tmp_job_formset
 
     else:
+        # raise Exception("Coucou2")
         job_formset = formset_factory(JobWithOptionsForm)(
             form_kwargs={'user': request.user}
         )
+    # raise ValidationError("'%(plop)s'", code='plop', params = {'plop': job_formset})
+
     return form(
         {
             'jobform': job_formset,
@@ -150,15 +199,19 @@ def payment(request):
     View used to create a new invoice and make the payment
     """
     # user = request.user
-    jids = request.session['jids']
+    # jids = request.session['jids']
     # raise ValidationError("'%(path)s'", code='path', params = {'path': jids})
-    jobs = JobWithOptions.objects.filter(id__in=jids)
+    jobs = JobWithOptions.objects.filter(user=request.user, status='Printable', paid='False')
     users = {}
     for job in jobs:
         try:
             users[job.printAs]+=job.price
+            job.paid = True
+            job.save()
         except KeyError:
             users[job.printAs]=job.price
+            job.paid = True
+            job.save()
 
     for user in users:
         # If payment_method balance doesn't exist, then you're not allowed to print.