WIP on account wizard. Wizard: can use switch for deletion. Better display of formsets on done wizard.

1 files changed, 83 insertions, 45 deletions

diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index d486474d8..68ca640a0 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -39,6 +39,7 @@ from django.forms import ValidationError
 from django.shortcuts import redirect, render
 from django.template import loader
 from django.utils.translation import ugettext_lazy as _
+from django.utils.safestring import mark_safe
 
 from ishtar_common import models
 from ishtar_common.forms import CustomForm
@@ -136,6 +137,7 @@ class Wizard(NamedUrlWizardView):
     ignore_init_steps = []
     file_storage = default_storage
     main_item_select_keys = ('selec-',)
+    formset_pop_deleted = True
 
     saved_args = {}  # argument to pass on object save
 
@@ -347,7 +349,8 @@ class Wizard(NamedUrlWizardView):
         """Get the data to present in the last page"""
         datas = []
         for form in forms:
-            base_form = hasattr(form, 'forms') and form.forms[0] or form
+            is_formset = hasattr(form, 'forms')
+            base_form = is_formset and form.forms[0] or form
             associated_models = hasattr(base_form, 'associated_models') and \
                 base_form.associated_models or {}
             if not hasattr(form, 'cleaned_data') and hasattr(form, 'forms'):
@@ -368,10 +371,10 @@ class Wizard(NamedUrlWizardView):
             for cleaned_data in cleaned_datas:
                 if not cleaned_data:
                     continue
-                if form_datas:
-                    form_datas.append(("", "", "spacer"))
+                current_form_data = []
                 items = hasattr(base_form, 'fields') and \
                     base_form.fields.keys() or cleaned_data.keys()
+                is_deleted = False
                 for key in items:
                     lbl = None
                     if key.startswith('hidden_'):
@@ -382,10 +385,13 @@ class Wizard(NamedUrlWizardView):
                         if hasattr(base_form, 'associated_labels') \
                            and key in base_form.associated_labels:
                             lbl = base_form.associated_labels[key]
-                    if not lbl or key not in cleaned_data:
+                    if key not in cleaned_data:  # no value
                         continue
                     value = cleaned_data[key]
-                    if value is None or value == '':
+                    if key == "DELETE" and value:
+                        is_deleted = True
+                    # no display when no label or no value
+                    if not lbl.strip() or value is None or value == '':
                         continue
                     if key in self.translated_keys:
                         value = _(value)
@@ -412,9 +418,32 @@ class Wizard(NamedUrlWizardView):
                                 value = unicode(item)
                             rendered_values.append(value)
                         value = u" ; ".join(rendered_values)
-                    form_datas.append((lbl, value, ''))
-            if form_datas:
-                datas.append((form.form_label, form_datas))
+                    current_form_data.append((lbl, value, ''))
+
+                if is_formset:
+                    # regroup each line
+                    displayed_values = []
+                    for lbl, value, cls in current_form_data:
+                        displayed_value = u""
+                        if lbl.strip():
+                            displayed_value = u"<strong>{}{}</strong> ".format(
+                                 lbl, _(u":"))
+                        displayed_value += unicode(value)
+                        displayed_values.append(displayed_value)
+                    value = u" ; ".join(displayed_values)
+                    if is_deleted:
+                        value = u"<span class='text-danger'>{}</span>".format(
+                            value)
+                    deleted = u"<span class='text-danger'>{}</span>".format(
+                        _(u"Deleted")) if is_deleted else ""
+                    form_datas.append((mark_safe(deleted), mark_safe(value),
+                                       ''))
+                else:
+                    form_datas += current_form_data
+
+            if not form_datas:
+                continue
+            datas.append((form.form_label, form_datas))
         return datas
 
     def get_extra_model(self, dct, form_list):
@@ -832,24 +861,25 @@ class Wizard(NamedUrlWizardView):
                 # manage deletion
                 to_delete, not_to_delete = self.get_deleted(data.keys())
                 # raz deleted fields
-                for key in data.keys():
-                    items = key.split('-')
-                    if len(items) < 2 or items[-2] not in to_delete:
-                        continue
-                    data.pop(key)
-                if to_delete:
-                    # reorganize
-                    for idx, number in enumerate(sorted(not_to_delete,
-                                                        key=lambda x: int(x))):
-                        idx = unicode(idx)
-                        if idx == number:
+                if self.formset_pop_deleted:
+                    for key in data.keys():
+                        items = key.split('-')
+                        if len(items) < 2 or items[-2] not in to_delete:
                             continue
-                        for key in data.keys():
-                            items = key.split('-')
-                            if len(items) > 2 and number == items[-2]:
-                                items[-2] = unicode(idx)
-                                k = u'-'.join(items)
-                                data[k] = data.pop(key)[0]
+                        data.pop(key)
+                    if to_delete:
+                        # reorganize
+                        for idx, number in enumerate(
+                                sorted(not_to_delete, key=lambda x: int(x))):
+                            idx = unicode(idx)
+                            if idx == number:
+                                continue
+                            for key in data.keys():
+                                items = key.split('-')
+                                if len(items) > 2 and number == items[-2]:
+                                    items[-2] = unicode(idx)
+                                    k = u'-'.join(items)
+                                    data[k] = data.pop(key)[0]
                 # get a form key
                 frm = form.form
                 if callable(frm):
@@ -914,7 +944,6 @@ class Wizard(NamedUrlWizardView):
                     if frm.fields[key].widget.source_full is not None:
                         frm.fields[key].widget.source_full = unicode(
                             frm.fields[key].widget.source_full) + "own/"
-
         return form
 
     def render_next_step(self, form, **kwargs):
@@ -926,8 +955,9 @@ class Wizard(NamedUrlWizardView):
         request = self.request
         if request.POST.get('formset_modify') \
            or request.POST.get('formset_add') \
-           or [key for key in request.POST.keys()
-               if key.endswith('DELETE') and request.POST[key]]:
+           or (self.formset_pop_deleted and [
+            key for key in request.POST.keys()
+            if key.endswith('DELETE') and request.POST[key]]):
             return self.render(form)
         elif 'validate_and_end' in request.POST \
                 and request.POST['validate_and_end']:
@@ -1382,6 +1412,7 @@ class OrganizationDeletionWizard(DeletionWizard):
 
 
 class AccountWizard(Wizard):
+    formset_pop_deleted = False
     model = models.Person
 
     def get_formated_datas(self, forms):
@@ -1398,23 +1429,26 @@ class AccountWizard(Wizard):
         """
         Save the account
         """
+        form_dict = kwargs['form_dict']
+
+        main_form = form_dict['account-account_management']
+        if not main_form.is_valid():
+            return self.render(main_form)
+
         dct = {}
-        for form in form_list:
-            if not form.is_valid():
-                return self.render(form)
-            associated_models = hasattr(form, 'associated_models') and \
-                form.associated_models or {}
-            if type(form.cleaned_data) == dict:
-                for key in form.cleaned_data:
-                    if key == 'pk':
-                        continue
-                    value = form.cleaned_data[key]
-                    if key in associated_models and value:
-                        value = associated_models[key].objects.get(pk=value)
-                    dct[key] = value
+        associated_models = main_form.associated_models
+        if type(main_form.cleaned_data) == dict:
+            for key in main_form.cleaned_data:
+                if key == 'pk':
+                    continue
+                value = main_form.cleaned_data[key]
+                if key in associated_models and value:
+                    value = associated_models[key].objects.get(pk=value)
+                dct[key] = value
         person = self.get_current_object()
         if not person:
-            return self.render(form)
+            return self.render(form_dict['selec-account_management'])
+
         for key in dct.keys():
             if key.startswith('hidden_password'):
                 dct['password'] = dct.pop(key)
@@ -1441,10 +1475,14 @@ class AccountWizard(Wizard):
             account.set_password(dct['password'])
         account.save()
 
-        if 'send_password' in dct and dct['send_password'] and \
-           settings.ADMINS:
-            site = Site.objects.get_current()
+        profile_form = form_dict['profile-account_management']
+        for form in profile_form:
+            print(form.cleaned_data)
 
+        final_form = form_dict['final-account_management']
+        if settings.ADMINS and type(final_form.cleaned_data) == dict and \
+                 final_form.cleaned_data.get('send_password', None):
+            site = Site.objects.get_current()
             app_name = site and ("Ishtar - " + site.name) \
                 or "Ishtar"
             context = {