Implement working change password.

Author: Marie Klaus

accounts/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from .models import Department, Profile
+from .models import Department, Profile, ProfileDepartment
 from .forms import UserCreationForm, UserChangeForm
 
 # load custom user model
@@ -45,3 +45,4 @@ class UserAdmin(BaseUserAdmin):
 # admin.site.register(UserManager)
 admin.site.register(Department)
 admin.site.register(Profile)
+admin.site.register(ProfileDepartment)

accounts/forms.py

@@ -165,7 +165,7 @@ class UpdateUserForm(UserChangeForm):
 
     class Meta:
         model = User
-        fields = ('first_name', 'last_name', 'email', 'password')
+        fields = ('first_name', 'last_name', 'email')
         widgets = {
             'first_name': forms.TextInput(
                 attrs = {
@@ -250,18 +250,20 @@ def clean_avatar(self):
 
         return avatar
 
+### TO DO:
 ###### CHANGE PROFILE_DEPARTMENT FORM ######
-class ProfileDepartmentChangeForm(forms.ModelForm):
+# class ProfileDepartmentChangeForm(forms.ModelForm):
 
-    DEPARTMENT_CHOICES = [[department.id, department.department_name] for department in Department.objects.all()]
+    # DEPARTMENT_CHOICES = [(department.id, department.department_name) for department in Department.objects.all()]
+    # # DEPARTMENT_CHOICES = [(1, 'SE'), (2,'PM')]
 
-    department = forms.MultipleChoiceField(
-        required = False,
-        widget=forms.CheckboxSelectMultiple,
-        choices=DEPARTMENT_CHOICES
-    )
+    # departments = forms.MultipleChoiceField(
+    #     required = False,
+    #     widget=forms.CheckboxSelectMultiple,
+    #     choices=DEPARTMENT_CHOICES
+    # )
 
-    class Meta:
-        model = ProfileDepartment
-        fields = ('department',)
+    # class Meta:
+    #     model = ProfileDepartment
+    #     fields = ('departments',)
 

accounts/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.1.2 on 2018-12-02 16:02
+# Generated by Django 2.1.2 on 2018-12-03 21:40
 
 from django.conf import settings
 from django.db import migrations, models
@@ -39,23 +39,31 @@ class Migration(migrations.Migration):
                 ('department_name', models.CharField(max_length=32)),
             ],
         ),
+        migrations.CreateModel(
+            name='Expertise',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+        ),
         migrations.CreateModel(
             name='Profile',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('occupation', models.CharField(blank=True, choices=[('STUDENT', 'Student'), ('CD', 'Code+Design Camper'), ('AC_STAFF', 'Academic Team'), ('ADMIN_STAFF', 'Code Administration Team'), ('ALUMNI', 'Alumni'), ('EXTERNAL', 'External')], default='STUDENT', max_length=32, null=True)),
-                ('institution', models.CharField(blank=True, choices=[('CODE', 'Code University'), ('CD', 'Code+Design Camps'), ('OTHER', 'other')], default='CODE', max_length=32, null=True)),
+                ('institution', models.CharField(blank=True, choices=[('CODE', 'CODE University Berlin'), ('CD', 'Code+Design Camps'), ('OTHER', 'other')], default='CODE', max_length=32, null=True)),
                 ('avatar', models.ImageField(blank=True, null=True, upload_to='profile_images')),
                 ('last_modified', models.DateTimeField(auto_now=True)),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
-        migrations.CreateModel(
-            name='ProfileDepartment',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='accounts.Department')),
-                ('profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='accounts.Profile')),
-            ],
+        migrations.AddField(
+            model_name='expertise',
+            name='current_profile',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='accounts.Profile'),
+        ),
+        migrations.AddField(
+            model_name='expertise',
+            name='departments',
+            field=models.ManyToManyField(to='accounts.Department'),
         ),
     ]

accounts/migrations/0002_auto_20181203_2253.py

@@ -0,0 +1,33 @@
+# Generated by Django 2.1.2 on 2018-12-03 21:53
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProfileDepartment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('current_profile', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='accounts.Profile')),
+                ('departments', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='accounts.Department')),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='expertise',
+            name='current_profile',
+        ),
+        migrations.RemoveField(
+            model_name='expertise',
+            name='departments',
+        ),
+        migrations.DeleteModel(
+            name='Expertise',
+        ),
+    ]

accounts/migrations/0003_auto_20181203_2256.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.2 on 2018-12-03 21:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0002_auto_20181203_2253'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='profiledepartment',
+            old_name='current_profile',
+            new_name='profile',
+        ),
+    ]

accounts/migrations/0004_auto_20181204_0935.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.1.2 on 2018-12-04 08:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0003_auto_20181203_2256'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='profiledepartment',
+            name='departments',
+        ),
+        migrations.AddField(
+            model_name='profiledepartment',
+            name='departments',
+            field=models.ManyToManyField(to='accounts.Department'),
+        ),
+    ]

accounts/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from enum import Enum
+from django.forms.models import model_to_dict
 # use Django signals to extend User object
 from django.db.models.signals import post_save
 from django.contrib.auth.models import (
@@ -103,7 +103,7 @@ def is_active(self):
 
 class Department(models.Model):
     department_name = models.CharField(max_length=32)
-
+    
     def __str__(self):
         return self.department_name
 
@@ -138,22 +138,77 @@ class Profile(models.Model):
     institution = models.CharField(max_length=32, null=True, blank=True, choices=INSTITUTION_CHOICES, default=CODE)
     avatar = models.ImageField(upload_to='profile_images', null=True, blank=True)
     last_modified = models.DateTimeField(auto_now=True)
-
-    # def get_occupation_di(self):
-    #     (occupation, occupation.value) for occupation in OCCUPATION_CHOICES:
-    #     return self.occupation.value
-
 
     # TO DO PROVIDE PROFILECHANGEFORM FOR ADMIN 
     # def __str__(self):
     #     return  self.user
 
 class ProfileDepartment(models.Model):
-    profile = models.ForeignKey(Profile, on_delete=models.CASCADE)
-    department = models.ForeignKey(Department, on_delete=models.CASCADE)
+    profile = models.ForeignKey(Profile, on_delete=models.CASCADE, null=True)
+    departments = models.ManyToManyField(Department)
 
-    def __str__(self):
-        return  "%s %s" % (self.profile, self.department)
+    @classmethod
+    def add_department(cls, profile, new_department):
+        profile_department, created = cls.objects.get_or_create(
+            profile=profile
+        )
+        profile_department.departments.add(new_department)
+
+    @classmethod
+    def remove_department(cls, profile, department):
+        profile_department, created = cls.objects.get_or_create(
+            profile=profile
+        )
+        profile_department.departments.remove(department)
+
+    # def __str__(self):
+    #     return  "%s %s" % (self.profile.user, self.departments)
+
+####### Mixins ##########
+
+# source:
+# https://stackoverflow.com/questions/1355150/django-when-saving-how-can-you-check-if-a-field-has-changed
+
+# class ModelDiffMixin(object):
+#     """A model mixin that tracks model fields' values 
+#     and whether  fields have been changed."""
+
+#     def __init__(self, *args, **kwargs):
+#         super(ModelDiffMixins, self).__init__(*args, **kwargs)
+#         self.__initial = self.dict
+
+#     @property
+#     def diff(self):
+#         d1 = self.__initial
+#         d2 = self._dict
+#         diffs = [(k, (v, d2[k])) for k, v in d1.items() if v != d2[k]]
+#         return dict(diffs)
+
+#     @property
+#     def has_changed(self):
+#         return bool(self.diff)
+
+#     @property
+#     def changed_fields(self):
+#         return self.diff.keys()
+
+#     def get_field_diff(self, field_name):
+#         """
+#         Returns a diff for field if it's changed and None otherwise.
+#         """
+#         return self.diff.get(field_name, None)
+
+#     def save(self, *args, **kwargs):
+#         """
+#         Saves model and set initial state.
+#         """
+#         super(ModelDiffMixin, self).save(*args, **kwargs)
+#         self.__initial = self._dict
+
+#     @property
+#     def _dict(self):
+#         return model_to_dict(self, 
+#             fields=[field.name for field in self._meta.fields])
 
 # Trigger creation of corresponding user profile as soon as Django User object has been created.
 def create_profile(sender, **kwargs):

accounts/templates/change_password.html

@@ -15,60 +15,29 @@ <h2 style="margin: auto; "> Change password </h2>
                 <img src="{% static 'outline_account_circle.png' %}"/>
             </div>
         </div>
-        {% if error %} 
-        <div class="alert alert-warning" role="alert">
-          {{ error }}
-        </div>
-        {% endif %}
-        {% if success %} 
-        <div class="alert alert-success" role="alert">
-          {{ success }}
-        </div>
+        {% if messages %}
+        <ul class="messages">
+            {% for message in messages %}
+            <li{% if message.tag %} class="{{ message.tag }}"{% endif %}>{{ message }}</li>
+            {% endfor %}
+        </ul>
         {% endif %}
 
         <hr />
 
         <form class="" style="margin: auto; width: 100%;"
-            method="POST" action="{% url 'profile' %}">
+            method="POST" action="{% url 'change_password'%}">
             {%  csrf_token %}
             {{form.as_p}}
-            <!-- <div class="form-group">
-                <label for="first_name" style="font-size: 10px;">First name</label>
-                <p>{{user_form.first_name}}</p>
-                <p>{{user_form.first_name.errors}}</p>
-                <hr>
-            </div>
-            <div class="form-group">
-                <label for="last_name" style="font-size: 10px;">Last name</label>
-                <p>{{user_form.last_name}}</p>
-                <p>{{user_form.last_name.errors}}</p>
-                <hr>
-            </div>
-            <div class="form-group">
-                <label for="email" style="font-size: 10px;">Email</label>
-                <p>{{user_form.email}}</p>
-                <p>{{user_form.email.errors}}</p>
-                <hr>
-            </div>
-            <div class="form-group">
-                    <label for="password-confirm" style="font-size: 10px;">Enter your password to confirm changes.</label>
-                    <p>{{user_form.password_confirm}}</p>
-                    <p>{{user_form.password_confirm.errors}}</p>
-                    <hr>
-                </div> -->
             <div class="form-row">
                 <input
                     class="btn btn-primary animated pulse"
                     style="background: linear-gradient(to right, rgb(36, 198, 220), rgb(81, 74, 157));
                             margin: 0 auto; width: 60%;"
                     type="submit"
-                    value="Submit changes"/>
+                    value="Reset password"/>
             </div>
         </form>
-        <!-- <a href="">Change password</a> -->
-        <!-- <a onclick="javascript:window.location.href='{% url 'change_password' %}';">Change password</a> -->
-
-        <a class="pl-3"><img src="{% static 'outline_edit.png' %}"/></a>
     </div>
 </div>
 {% endblock %}

accounts/templates/profile.html

@@ -72,11 +72,6 @@ <h3 style="margin: auto; "> {{user.first_name}} {{user.last_name}} </h3>
                 <p>{{profile_form.avatar}}</p>
                 <p>{{profile_form.avatar.errors}}</p>
             </div>
-            <div class="form-check">
-                <label for="select-department" style="font-size: 10px;">Your study program or field of expertise.</label>
-                <p>{{prof_dep_form.department}}</p>
-                <p>{{prof_dep_form.department.errors}}</p>
-            </div>
             <br>            
             <div class="form-row">
                 <input

accounts/urls.py

@@ -6,5 +6,5 @@
     path('logout', views.logout, name='logout'),
     path('signup', views.signup, name='signup'),
     path('profile', views.profile_edit, name='profile'),
-    path('change-password', views.change_password, name='change_password'),
+    path('password', views.change_password, name='change_password'),
 ]