Merge pull request #363 from pythoncanarias/issue#362

Add Class-based view to update address and phone

Author: sdelquin

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
   "settings": {
     "editor.formatOnSave": true,
     // Python
-    "python.pythonPath": "/opt/venv/bin/python",
+    "python.defaultInterpreterPath": "/opt/venv/bin/python",
     "[python]": {
       "editor.codeActionsOnSave": {
         "source.organizeImports": true

apps/commons/templates/includes/error_list.html

@@ -0,0 +1,7 @@
+{% if errors %}
+  <ul class="errorlist">
+    {% for error in errors %}
+    <li>{{ error }}</li>
+    {% endfor %}
+  </ul>
+{% endif %}

apps/commons/templatetags/utils.py

@@ -33,3 +33,11 @@ def is_active(context, named_url):
         return 'is-active'
     else:
         return ''
+
+
+@register.inclusion_tag('includes/error_list.html')
+def error_list(field):
+    print(field, type(field))
+    return {
+        'errors': field.errors,
+    }

apps/members/forms.py

@@ -3,6 +3,8 @@
 from django.contrib.auth import authenticate, update_session_auth_hash
 from django.core.exceptions import ValidationError
 
+from .models import Member
+
 MIN_PASSWORD_LENGTH = 8
 
 # Validation error messages
@@ -150,3 +152,23 @@ def save(self, request):
         self.user.save()
         update_session_auth_hash(request, self.user)
         messages.success(request, "Contraseña cambiada correctamente")
+
+
+class ChangeAddressForm(forms.ModelForm):
+    class Meta:
+        model = Member
+        fields = [
+            'address',
+            'rest_address',
+            'postal_code',
+            'city',
+            'phone',
+        ]
+
+    address = forms.CharField(label='Dirección<sup>*</sup>', strip=True)
+    rest_address = forms.CharField(label='(extra)', required=False, strip=True)
+    postal_code = forms.CharField(
+        label="Cód. postal<sup>*</sup>", max_length=12, strip=True
+    )
+    city = forms.CharField(label='Ciudad<sup>*</sup>', strip=True)
+    phone = forms.CharField(label='Teléfono', required=False, strip=True)

apps/members/menu.py

@@ -8,6 +8,7 @@
     .finished()
     .add_section('ops', 'Operaciones')
     .add_menu_item("Cambiar contraseña", "members:password_change")
+    .add_menu_item("Cambiar dirección", "members:address_change")
     .add_menu_item("Salir (<i>Logout</i>)", "members:logout")
     .finished()
 )

apps/members/static/members/css/main.scss

@@ -1 +1,15 @@
 @import 'apps/commons/static/commons/css/base';
+
+.pb-vertical {
+  flex-direction: column;
+  align-items: baseline;
+}
+
+.rest-address-label {
+  margin-top: 1rem;
+  font-weight: 100;
+}
+
+.phone-label {
+  font-weight: 100;
+}

apps/members/templates/members/address-change.html

@@ -0,0 +1,64 @@
+{% extends 'members/base.html' %}
+{% load utils %}
+
+{% block content %}
+<div class="box">
+
+  <nav class="panel">
+    <h3 class="panel-heading">Dirección postal y teléfono</h3>
+    <div class="panel-block">
+      <form class="form" method="POST" action=".">
+        {% csrf_token %}
+
+        {% for hidden in form.hidden_fields %}
+          {{ hidden }}
+        {% endfor %}
+
+        <table class="table">
+
+          <tr>
+            <th>
+              {{ form.address.label|safe }}
+              <div class="rest-address-label">{{ form.rest_address.label|safe }}</div>
+            </th>
+            <td>
+              <input name="address" class="input" type="text" value="{{ form.address.value }}">
+              {% error_list form.address %}
+              <input name="rest_address" class="input" type="text" value="{{ form.rest_address.value }}">
+              {% error_list form.rest_address %}
+          </tr>
+
+          <tr>
+            <th>{{ form.postal_code.label|safe }}</th>
+            <td>
+              <input name="postal_code" class="input" type="text" value="{{ form.postal_code.value }}">
+              {% error_list form.postal_code %}
+              </td>
+          </tr>
+
+          <tr>
+            <th>{{ form.city.label|safe }}</th>
+            <td>
+              <input name="city" class="input" type="text" value="{{ form.city.value }}">
+              {% error_list form.city %}
+              </td>
+          </tr>
+
+          <tr>
+            <th class="phone-label">{{ form.phone.label|safe }}</th>
+            <td>
+              <input name="phone" class="input" type="text" value="{{ form.phone.value }}">
+              {% error_list form.phone %}
+              </td>
+          </tr>
+
+        </table>
+
+        <button type="submit" role="button" class="button is-link is-outlined">Cambiar dirección</button>
+
+      </form>
+    </div>
+  </nav>
+</div>
+
+{% endblock content %}

apps/members/templates/members/profile.html

@@ -19,8 +19,7 @@ <h3 class="panel-heading">Datos personales</h3>
 
   <nav class="panel">
     <h3 class="panel-heading">Socio/a: #{{ member.pk }}</h3>
-    <div class="panel-block">
-
+    <div class="panel-block pb-vertical">
       <table class="table table-striped">
         <tr>
           <th>Dirección</th>
@@ -43,9 +42,10 @@ <h3 class="panel-heading">Socio/a: #{{ member.pk }}</h3>
           <td>{{ member.phone|default:"No disponible" }}</td>
         </tr>
       </table>
+
+      <a href="{% url 'members:address_change' %}"><i class="fas fa-edit"></i> Actualizar datos</a>
     </div>
   </nav>
-
 </div>
 
 {% endblock content %}

apps/members/urls.py

@@ -9,6 +9,9 @@
     path("profile/", views.profile, name="profile"),
     path("membership/", views.view_membership, name="membership"),
     path("password/change/", views.password_change, name="password_change"),
+    path(
+        "address/change/", views.ChangeAddress.as_view(), name="address_change"
+    ),
     path("login/", views.member_login, name="login"),
     path("logout/", views.member_logout, name="logout"),
 ]

apps/members/views.py

@@ -6,7 +6,8 @@
 from django.core.exceptions import PermissionDenied
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect, render
-from django.urls import reverse
+from django.urls import reverse, reverse_lazy
+from django.views.generic import UpdateView
 
 from . import forms
 from .menu import main_menu
@@ -104,3 +105,27 @@ def password_change(request):
             "menu": main_menu,
         },
     )
+
+
+class ChangeAddress(UpdateView):
+    form_class = forms.ChangeAddressForm
+    template_name = 'members/address-change.html'
+
+    def get_success_url(self):
+        return reverse_lazy('members:profile')
+
+    def get_object(self, queryset=None):
+        return self.request.user.member
+
+    def form_invalid(self, form):
+        num_errors = sum(len(err) for err in form.errors.values())
+        messages.error(
+            self.request, f'El formulario tiene {num_errors} errores'
+        )
+        return super().form_invalid(form)
+
+    def get_context_data(self, **kwargs):
+        context = {
+            'menu': main_menu,
+        }
+        return super().get_context_data(**context)