Fix branch integrity error, update notify my profile, and remove unne…

…cessary images (#38)

dashboard/static/css/admin.css

@@ -217,7 +217,7 @@ body {
 }
 
 .message.success {
-    background-color: #4CAF50;
+    background-color: #cda45e;
     /* Green */
 }
 
@@ -258,3 +258,8 @@ body {
     background-color: #cda45e;
     color: white;
 }
+
+.alert-success {
+    background-color: #cda45e;
+    color: white;
+}

dashboard/views.py

@@ -1,3 +1,4 @@
+from django.db import IntegrityError
 from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib import messages
 from django.views import View
@@ -114,25 +115,32 @@ def post(self, request, branch_id):
             request.POST, queryset=opening_hours)
 
         if opening_hour_formset.is_valid():
-            # Proceed with saving the formset if it's valid
-            opening_hour_instances = opening_hour_formset.save(commit=False)
-            for opening_hour_instance in opening_hour_instances:
-                opening_hour_instance.branch = branch  # Set the branch before saving
-                opening_hour_instance.save()
-
-            for obj in opening_hour_formset.deleted_objects:
-                obj.delete()
-            messages.success(request, 'Opening hours updated successfully')
-            return redirect('dashboard:branches.edit', pk=branch_id)
+            try:
+                # Save the formset if it's valid
+                opening_hour_instances = opening_hour_formset.save(
+                    commit=False)
+                for opening_hour_instance in opening_hour_instances:
+                    opening_hour_instance.branch = branch  # Set the branch before saving
+                    opening_hour_instance.save()
+
+                for obj in opening_hour_formset.deleted_objects:
+                    obj.delete()
+
+                messages.success(request, 'Opening hours updated successfully')
+                return redirect('dashboard:branches.edit', pk=branch_id)
+            except IntegrityError as e:
+                # Handle the integrity error for duplicate days
+                messages.error(
+                    request, 'A duplicate entry exists for the same day.')
         else:
             # If formset is invalid, display the formset with errors
             print(opening_hour_formset.errors)
-            messages.error(
-                request, 'Please correct the days or time errors below.')
-            return render(request, 'branches/update-opening-hours.html', {
-                'branch': branch,
-                'opening_hour_formset': opening_hour_formset,
-            })
+            messages.error(request, 'Please correct the errors below.')
+
+        return render(request, 'branch/update-opening-hours.html', {
+            'branch': branch,
+            'opening_hour_formset': opening_hour_formset,
+        })
 
 
 class ViewDeleteBranchView(View):

users/static/users.css

@@ -93,3 +93,8 @@ h2 {
     margin-top: 15px;
     text-align: center;
 }
+
+.alert-success {
+    background-color: #cda45e;
+    color: white;
+}

users/templates/profile-detail.html

@@ -2,10 +2,25 @@
 
 {% load static %}
 
+{% block css_files %}
+
+<link href="{% static 'users.css' %}" rel="stylesheet" />
+
+{% endblock %}
+
 {% block content %}
 
 <section id="menu" class="menu section-bg mt-5">
     <div class="container mt-5">
+
+        {% if messages %}
+        <div class="alert alert-success" id="success-message">
+            {% for message in messages %}
+            {{ message }}
+            {% endfor %}
+        </div>
+        {% endif %}
+
         <h2 class="mb-4">My Profile</h2>
         <div class="row">
             <div class="col-md-3">
@@ -45,3 +60,17 @@ <h2 class="mb-4">My Profile</h2>
 </section>
 
 {% endblock %}
+
+{% block script %}
+
+<!--Added Hanifah - Function to remove success message after 5 seconds -->
+<script>
+    setTimeout(function () {
+        var successMessage = document.getElementById('success-message');
+        if (successMessage) {
+            successMessage.parentNode.removeChild(successMessage);
+        }
+    }, 5000);  // 5000 milliseconds = 5 seconds
+</script>
+{% endblock %}
+

users/views.py

@@ -80,6 +80,7 @@ def post(self, request, *args, **kwargs):
             profile_form.save()
 
             # Redirect to a success page
+            messages.success(request, 'Profile has been updated succesfully')
             return redirect(to='users:profile.show')
         return render(request, self.template_name, {'form': form, 'profile_form': profile_form})