Merge pull request #99 from HackAssistant/draft_applis

Casassarnau · web-flow · commit c9ce0fdb9c52 · 2022-12-29T14:39:44.000+01:00
Added draft applications
diff --git a/app/static/js/toasts.js b/app/static/js/toasts.js
@@ -0,0 +1,42 @@
+let ToastManager = {
+    add_toast: function (message, type, delay=null) {
+        let toast = $(
+            `<div class="toast align-items-center fade show bg-${type}" role="alert" aria-live="assertive" aria-atomic="true">
+                <div class="d-flex">
+                    <div class="toast-body">${message}</div>
+                    <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
+                </div>
+            </div>`
+        )
+        $('#toasts').append(toast)
+        if (delay !== null) {
+            setTimeout(this.clear, delay, toast.get(0));
+        }
+    },
+    success: function (message, delay=null) {
+        this.add_toast(message, 'success', delay)
+    },
+    info: function (message, delay=null) {
+        this.add_toast(message, 'info', delay)
+    },
+    warning: function (message, delay=null) {
+        this.add_toast(message, 'warning', delay)
+    },
+    error: function (message, delay=null) {
+        this.add_toast(message, 'danger', delay)
+    },
+    primary: function (message, delay=null) {
+        this.add_toast(message, 'primary', delay)
+    },
+    secondary: function (message, delay=null) {
+        this.add_toast(message, 'secondary', delay)
+    },
+    clear: function (item) {
+        bootstrap.Toast.getOrCreateInstance(item).hide()
+    },
+    clearAll: function () {
+        $('#toasts > div').each((_, item) => {
+            this.clear(item)
+        })
+    }
+}
diff --git a/app/templates/components/bootstrap5_form.html b/app/templates/components/bootstrap5_form.html
@@ -107,6 +107,7 @@
                                     field.fadeIn()
                                 } else {
                                     field.fadeOut()
+                                    field.find('input,textarea,select').val('')
                                 }
                             })
                             if (!{{ values|safe }}.includes(objectifyForm(form)['{{ cond_field_name }}'])) {
diff --git a/app/templates/components/imports.html b/app/templates/components/imports.html
@@ -28,3 +28,6 @@
 
 <!-- Our WebPage style -->
 <link href="{% static 'css/main.css' %}" rel="stylesheet">
+
+<!-- ToastManager -->
+<script src="{% static 'js/toasts.js' %}"></script>
diff --git a/app/templates/components/toast.html b/app/templates/components/toast.html
@@ -1,12 +1,10 @@
-{% if messages %}
-    <div class="position-fixed bottom-0 end-0 p-3" style="z-index: 11">
-        {% for message in messages %}
-            <div class="toast align-items-center show bg-{{ message.tags }}" role="alert" aria-live="assertive" aria-atomic="true">
-                <div class="d-flex">
-                    <div class="toast-body">{{ message|capfirst }}</div>
-                    <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
-                </div>
+<div id="toasts" class="position-fixed bottom-0 end-0 p-3" style="z-index: 11">
+    {% for message in messages %}
+        <div class="toast align-items-center fade show bg-{{ message.tags }}" role="alert" aria-live="assertive" aria-atomic="true">
+            <div class="d-flex">
+                <div class="toast-body">{{ message|capfirst }}</div>
+                <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
             </div>
-        {% endfor %}
-    </div>
-{% endif %}
+        </div>
+    {% endfor %}
+</div>
diff --git a/application/forms/mentor.py b/application/forms/mentor.py
@@ -32,7 +32,7 @@ class MentorForm(ApplicationForm):
     study_work = forms.TypedChoiceField(
         required=True,
         label='Are you studying or working?',
-        choices=(('Study', _('Study')), ('Study', _('Work'))),
+        choices=(('Study', _('Study')), ('Work', _('Work'))),
         widget=forms.RadioSelect(attrs={'class': 'inline'})
     )
 
diff --git a/application/migrations/0030_draftapplication.py b/application/migrations/0030_draftapplication.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.0.8 on 2022-12-29 12:07
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('application', '0029_applicationtypeconfig_spots'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DraftApplication',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('data', models.TextField(blank=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/application/models.py b/application/models.py
@@ -394,3 +394,32 @@ def create_log(cls, application, user, name='Change', comment=''):
                     changes[field] = change
             log.changes = changes
         return log
+
+
+class DraftApplicationManager(models.QuerySet):
+    def get_or_create(self, defaults=None, **kwargs):
+        if isinstance(defaults, dict) and defaults.get('form_data', None) is not None:
+            defaults['data'] = json.dumps(defaults['form_data'])
+            del defaults['form_data']
+        return super().get_or_create(defaults, **kwargs)
+
+
+class DraftApplication(models.Model):
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.DO_NOTHING)
+
+    data = models.TextField(blank=True)
+
+    objects = DraftApplicationManager.as_manager()
+
+    @property
+    def form_data(self):
+        try:
+            return json.loads(self.data)
+        except json.JSONDecodeError:
+            return {}
+
+    @form_data.setter
+    def form_data(self, new_data: dict):
+        data = self.form_data
+        data.update(new_data)
+        self.data = json.dumps(data)
diff --git a/application/signals.py b/application/signals.py
@@ -3,14 +3,15 @@
 from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
 
-from application.models import Edition, ApplicationTypeConfig, PromotionalCode
+from application.models import Edition, ApplicationTypeConfig, PromotionalCode, Application, DraftApplication
 
 
 @receiver(post_delete, sender=Edition, weak=False)
 @receiver(post_save, sender=Edition, weak=False)
 def clear_groups(sender, instance, **kwargs):
     created = kwargs.get('created', None)
     if created is None or created:
+        DraftApplication.objects.all().delete()
         for application_type in ApplicationTypeConfig.objects.all().values_list('name', flat=True):
             group = Group.objects.get(name=application_type)
             group.user_set.clear()
@@ -30,3 +31,9 @@ def clear_file_fields(sender, instance, **kwargs):
 @receiver(post_save, sender=PromotionalCode, weak=False)
 def reload_active(sender, instance, **kwargs):
     sender.active(force_update=True)
+
+
+@receiver(post_save, sender=Application, weak=False)
+def delete_draft_on_apply(sender, instance, created, **kwargs):
+    if created:
+        DraftApplication.objects.filter(user_id=instance.user_id).delete()
diff --git a/application/templates/application_form.html b/application/templates/application_form.html
@@ -28,6 +28,53 @@ <h3 class="mb-1">{% if request.user.is_organizer %}{{ application_form.instance.
             <div class="alert alert-info alert-dismissible fade show" role="alert">
                 {{ application_type.name }} {% translate 'applications are open. Hurry, they will close in' %} {{ application_type.time_left }}.
             </div>
+            {% if request.user.is_authenticated %}
+                <script>
+                    $(document).ready(() => {
+                        let timer
+                        let clear_timer
+                        let timeout = 5000; // Timout duration
+                        $('input,textarea,select').bind('change keyup', function () {
+                            if (timer) {
+                                clearTimeout(timer);
+                            }
+                            timer = setTimeout(saveData, timeout);
+                        });
+
+                        // Save data
+                        function saveData() {
+                            if (clear_timer) {
+                                clearTimeout(clear_timer);
+                            }
+                            $('.saved-string').html('Saving...');
+                            let form_obj = {};
+                            let form_array = $('form').serializeArray();
+                            $.each(form_array, function () {
+                                if (form_obj[this.name]) {
+                                    if (!form_obj[this.name].push) {
+                                        form_obj[this.name] = [form_obj[this.name]];
+                                    }
+                                    form_obj[this.name].push(this.value || '');
+                                } else {
+                                    form_obj[this.name] = this.value || '';
+                                }
+                            });
+
+                            form_obj['csrfmiddlewaretoken'] = '{{ csrf_token }}'
+
+                            // AJAX request
+                            $.ajax({
+                                url: '{% url 'save_draft' %}',
+                                type: 'post',
+                                data: form_obj,
+                                success: function () {
+                                    ToastManager.info('Saved!', timeout)
+                                }
+                            });
+                    }
+                    })
+                </script>
+            {% endif %}
         {% endif %}
 
         <form method="post" enctype="multipart/form-data" class="mt-4">
diff --git a/application/urls.py b/application/urls.py
@@ -11,4 +11,5 @@
     path('file/<str:field>/<str:uuid>/preview/', views.ApplicationFilePreview.as_view(),
          name='application_file_preview'),
     path('file/<str:field>/<str:uuid>/', views.ApplicationFile.as_view(), name='application_file'),
+    path('apply/save_draft/', views.SaveDraftApplication.as_view(), name='save_draft'),
 ]
diff --git a/application/views.py b/application/views.py
@@ -19,7 +19,7 @@
 from app.utils import is_installed
 from application import forms
 from application.emails import send_email_to_blocked_admins
-from application.models import Application, ApplicationTypeConfig, ApplicationLog, Edition
+from application.models import Application, ApplicationTypeConfig, ApplicationLog, Edition, DraftApplication
 from user.emails import send_verification_email
 from user.forms import UserProfileForm, RecaptchaForm
 from user.mixins import LoginRequiredMixin
@@ -109,11 +109,19 @@ def update_from_last_edition_application(self, application_type, initial_data):
         except Application.DoesNotExist:
             pass
 
+    def update_from_draft_application(self, initial_data):
+        try:
+            draft = DraftApplication.objects.get(user_id=self.request.user.id)
+            initial_data.update(draft.form_data)
+        except DraftApplication.DoesNotExist:
+            pass
+
     def get_forms(self, application_type, application_form_class):
         initial_data = {key: value for key, value in self.request.GET.dict().items()
                         if key not in application_form_class.exclude_save}
         if self.request.user.is_authenticated:
             self.update_from_last_edition_application(application_type, initial_data)
+            self.update_from_draft_application(initial_data)
         app_form_kwargs = {'initial': initial_data}
         user_form_kwargs = app_form_kwargs.copy()
         if self.request.user.is_authenticated:
@@ -166,6 +174,15 @@ def save_application(self, form, app_type, user):
         except Application.MultipleObjectsReturned:
             pass
 
+    def forms_are_valid(self, user_form, application_form, context):
+        if not self.request.user.is_authenticated and getattr(settings, 'RECAPTCHA_REGISTER', False) \
+                and RecaptchaForm.active():
+            recaptcha_form = RecaptchaForm(self.request.POST, request=self.request)
+            if not recaptcha_form.is_valid():
+                context.update({'recaptcha_form': recaptcha_form})
+                return False
+        return user_form.is_valid() and application_form.is_valid()
+
     def save_user(self, form, create_active_user):
         user = form.save(commit=False)
         user_registered = False
@@ -176,15 +193,6 @@ def save_user(self, form, create_active_user):
         user.save()
         return user, user_registered
 
-    def forms_are_valid(self, user_form, application_form, context):
-        if not self.request.user.is_authenticated and getattr(settings, 'RECAPTCHA_REGISTER', False) \
-                and RecaptchaForm.active():
-            recaptcha_form = RecaptchaForm(self.request.POST, request=self.request)
-            if not recaptcha_form.is_valid():
-                context.update({'recaptcha_form': recaptcha_form})
-                return False
-        return user_form.is_valid() and application_form.is_valid()
-
     def post(self, request, **kwargs):
         context = self.get_context_data(**kwargs)
         application_type = context.get('application_type')
@@ -347,3 +355,23 @@ def get(self, request, **kwargs):
                     .filter(user=application.user, type__compatible_with_others=False)\
                     .update(status=Application.STATUS_CANCELLED, status_update_date=timezone.now())
         return redirect(next_page)
+
+
+class SaveDraftApplication(LoginRequiredMixin, View):
+    def get_data(self):
+        data = self.request.POST.dict()
+        del data['csrfmiddlewaretoken']
+        for key, value in self.request.POST.dict().items():
+            if key[-2:] == '[]':
+                del data[key]
+                data[key[:-2]] = self.request.POST.getlist(key)
+        return data
+
+    def post(self, request, **kwargs):
+        data = self.get_data()
+        draft, created = DraftApplication.objects.get_or_create(user_id=self.request.user.id,
+                                                                defaults={'form_data': data})
+        if not created:
+            draft.form_data = data
+            draft.save()
+        return HttpResponse('OK!')

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@`
`107`	`107`	`field.fadeIn()`
`108`	`108`	`} else {`
`109`	`109`	`field.fadeOut()`
	`110`	`+ field.find('input,textarea,select').val('')`
`110`	`111`	`}`
`111`	`112`	`})`
`112`	`113`	`if (!{{ values\|safe }}.includes(objectifyForm(form)['{{ cond_field_name }}'])) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class MentorForm(ApplicationForm):`
`32`	`32`	`study_work = forms.TypedChoiceField(`
`33`	`33`	`required=True,`
`34`	`34`	`label='Are you studying or working?',`
`35`		`- choices=(('Study', _('Study')), ('Study', _('Work'))),`
	`35`	`+ choices=(('Study', _('Study')), ('Work', _('Work'))),`
`36`	`36`	`widget=forms.RadioSelect(attrs={'class': 'inline'})`
`37`	`37`	`)`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@`
`11`	`11`	`path('file/<str:field>/<str:uuid>/preview/', views.ApplicationFilePreview.as_view(),`
`12`	`12`	`name='application_file_preview'),`
`13`	`13`	`path('file/<str:field>/<str:uuid>/', views.ApplicationFile.as_view(), name='application_file'),`
	`14`	`+ path('apply/save_draft/', views.SaveDraftApplication.as_view(), name='save_draft'),`
`14`	`15`	`]`