New changes.

osinaweb/osinacore/migrations/0048_alter_customerprofile_business.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.5 on 2024-01-17 09:45
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osinacore', '0047_task_status_date'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customerprofile',
+            name='business',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='customer_profiles', to='osinacore.business'),
+        ),
+    ]

osinaweb/osinacore/migrations/0049_alter_customerprofile_business.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.5 on 2024-01-17 09:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osinacore', '0048_alter_customerprofile_business'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customerprofile',
+            name='business',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='osinacore.business'),
+        ),
+    ]

osinaweb/osinacore/models.py

@@ -27,7 +27,6 @@ class BusinessType(models.Model):
     name = models.CharField(max_length=50)
 
 
-
 class Business(models.Model):
     name = models.CharField(max_length=50)
     email = models.EmailField(unique=True)

osinaweb/osinacore/views.py

@@ -348,9 +348,12 @@ def createtask_epic(request):
 def add_customer(request):
     businesses = Business.objects.all().order_by('-id')
     references = Reference.objects.all().order_by('-id')
+    business_types = BusinessType.objects.all().order_by('-id')
+
     context = {      
     'businesses' : businesses, 
-    'references' :references
+    'references' :references,
+    'business_types' : business_types
 
     }
     return render(request, 'add_pages/add-customer.html', context)
@@ -358,11 +361,12 @@ def add_customer(request):
 
 @login_required
 def addbusiness(request):
+    business_types = BusinessType.objects.all().order_by('-id')
 
     context = {
-
-
+        'business_types': business_types,
     }
+
     return render(request, 'add_pages/add-business.html', context)
 
 
@@ -441,11 +445,6 @@ def add_time_modal(request, *args, **kwargs):
     }
     return render(request, 'popup_modals/addtime-modal.html', context)
 
-def delete_task_modal(request, *args, **kwargs):
-    context = {
-
-    }
-    return render(request, 'popup_modals/deletetask-modal.html', context)
 
 def show_points_modal(request, task_id):
     task = get_object_or_404(Task, task_id=task_id)
@@ -509,11 +508,14 @@ def add_tag_modal(request, *args, **kwargs):
     return render(request, 'popup_modals/addtag-modal.html', context)
 
 def add_business_modal(request, *args, **kwargs):
+
     context = {
 
     }
+
     return render(request, 'popup_modals/addbusiness-modal.html', context)
 
+
 def staff_position_modal(request):
 
     context = {
@@ -791,9 +793,12 @@ def save_business(request):
             vat = False
         commercial_registration = request.POST.get('commercial_registration')
         website = request.POST.get('website')
-        business_type = request.POST.get('business_type')
         logo = request.FILES.get('logo')
 
+        business_type_id = request.POST.get('type')
+
+        business_type = get_object_or_404(BusinessType, id=business_type_id)
+
         business = Business(
         name = name,
         email = email,
@@ -801,7 +806,7 @@ def save_business(request):
         vat = vat,
         commercial_registration = commercial_registration,
         website = website,
-        business_type = business_type,
+        type=business_type,
         logo = logo,
         phone_number = phone_number,
         )
@@ -824,9 +829,11 @@ def save_business_modal(request):
             vat = False
         commercial_registration = request.POST.get('commercial_registration')
         website = request.POST.get('website')
-        business_type = request.POST.get('business_type')
         logo = request.FILES.get('logo')
 
+        business_type_id = request.POST.get('type')
+        business_type = get_object_or_404(BusinessType, id=business_type_id)
+
         business = Business(
             name=name,
             email=email,
@@ -834,7 +841,7 @@ def save_business_modal(request):
             vat=vat,
             commercial_registration=commercial_registration,
             website=website,
-            business_type=business_type,
+            type=business_type,
             logo=logo,
             phone_number=phone_number,
         )
@@ -857,6 +864,8 @@ def save_customer(request):
             email = request.POST.get('email').lower()
             first_name = request.POST.get('first_name')
             last_name = request.POST.get('last_name')
+            business_id = request.POST.get('business')
+            business = get_object_or_404(Business, id=business_id)
             username = f"{first_name.lower()}{last_name.lower()}"
             original_username = username
             counter = 1 
@@ -870,7 +879,7 @@ def save_customer(request):
                 email=email,
                 password=request.POST.get('password2')
             )
-            user.first_name = last_name.lower().capitalize()
+            user.first_name = first_name.lower().capitalize()
             user.last_name = last_name.lower().capitalize()
             user.save()
  
@@ -884,6 +893,7 @@ def save_customer(request):
                 personal_website = request.POST.get('personal_website'),
                 status = request.POST.get('status'),
                 reference = reference,
+                business = business,
             )
     return redirect('customers')
 
@@ -1280,16 +1290,58 @@ def edit_epic(request, *args, **kwargs):
 @login_required
 def edit_task(request, task_id):
     task = get_object_or_404(Task, task_id=task_id)
-
     projects = Project.objects.all().order_by('-id')
-    
+    staffs = StaffProfile.objects.all().order_by('-id')
+
+    selected_project_id = request.POST.get('project', task.project.id) if request.method == 'POST' else task.project.id
+    epics_of_my_project = Epic.objects.filter(project_id=selected_project_id)
+
+    if request.method == 'POST':
+        task.name = request.POST.get('name')
+        
+        # Convert project ID to a Project instance
+        project_id = request.POST.get('project')
+        project = get_object_or_404(Project, id=project_id)
+        task.project = project
+        
+        # Convert epic ID to an Epic instance
+        epic_id = request.POST.get('epic')
+        epic = get_object_or_404(Epic, id=epic_id)
+        task.epic = epic
+        
+        task.requirement = request.POST.get('requirement')
+        task.status = request.POST.get('status')
+
+        # Convert assigned_to ID to a StaffProfile instance
+        assigned_to_id = request.POST.get('assigned_to')
+        assigned_to = get_object_or_404(StaffProfile, id=assigned_to_id)
+        task.assigned_to = assigned_to
+        
+        task.description = request.POST.get('description')
+        task.start_date = request.POST.get('start_date')
+        task.end_date = request.POST.get('end_date')
+
+        task.save()
+        return redirect('detailed-task', task_id=task.task_id)
+
     context = {
-    'task' :task,
-    'projects' : projects,
+        'task': task,
+        'projects': projects,
+        'epics_of_my_project': epics_of_my_project,
+        'staffs': staffs,
     }
     return render(request, 'edit_pages/edit-task.html', context)
 
 
+
+
+# TO FETCH THE EPICS OF THE SELECTED PROJECT WHEN EDITING A TASK
+def fetch_epics(request):
+    project_id = request.GET.get('project_id')
+    epics = Epic.objects.filter(project_id=project_id).values('id', 'title')
+    return JsonResponse({'epics': list(epics)})
+
+
 @login_required
 def edit_customer(request, customer_id):
     customer = get_object_or_404(CustomerProfile, customer_id=customer_id)
@@ -1568,3 +1620,76 @@ def get_latest_activities(request):
     recent_activities = render_to_string('recent-activities.html', response_data)
 
     return HttpResponse(recent_activities)
+
+
+
+
+# Delete Popup Modals
+@login_required
+def delete_customer_modal(request, customer_id):
+    customer = get_object_or_404(CustomerProfile, id=customer_id)
+
+    if request.method == 'POST':
+        customer.delete()
+        return redirect('customers')
+
+    context = {
+        'customer': customer,
+    }
+    return render(request, "delete_modals/delete-customer-modal.html", context)
+
+
+@login_required
+def delete_business_modal(request, business_id):
+    business = get_object_or_404(Business, id=business_id)
+
+    if request.method == 'POST':
+        business.delete()
+        return redirect('businesses')
+
+    context = {
+        'business': business,
+    }
+    return render(request, "delete_modals/delete-business-modal.html", context)
+
+
+@login_required
+def delete_staff_modal(request, staff_id):
+    staff = get_object_or_404(StaffProfile, id=staff_id)
+
+    if request.method == 'POST':
+        staff.delete()
+        return redirect('users')
+
+    context = {
+        'staff': staff,
+    }
+    return render(request, "delete_modals/delete-staff-modal.html", context)
+
+
+@login_required
+def delete_project_modal(request, project_id):
+    project = get_object_or_404(Project, id=project_id)
+
+    if request.method == 'POST':
+        project.delete()
+        return redirect('my-projects')
+
+    context = {
+        'project': project,
+    }
+    return render(request, "delete_modals/delete-project-modal.html", context)
+
+
+@login_required
+def delete_task_modal(request, task_id):
+    task = get_object_or_404(Task, id=task_id)
+
+    if request.method == 'POST':
+        task.delete()
+        return redirect('my-tasks')
+
+    context = {
+        'task': task,
+    }
+    return render(request, "delete_modals/delete-task-modal.html", context)

osinaweb/osinaweb/urls.py

@@ -77,7 +77,6 @@ urlpatterns = [
     path('show-points/<str:task_id>/', views.show_points_modal, name='showpoints'),
     path('add-time/', views.add_time_modal, name='addtime'),
     path('timeline/', views.timeline_modal, name='timeline'),
-    path('delete-task/', views.delete_task_modal, name='deletetask'),
     path('add-projecttype/', views.add_projecttype_modal, name='addprojecttype'),
     path('add-businesstype/', views.add_businesstype_modal, name='addbusinesstype'),
     path('add-reference/', views.add_reference_modal, name='addreference'),
@@ -88,6 +87,13 @@ urlpatterns = [
     path('userrecentativities/<int:user_id>', views.user_recent_activities_modal, name='userrecentativities'),
 
 
+    #Delete Modals
+    path('deletecustomermodal/<int:customer_id>', views.delete_customer_modal, name='deletecustomermodal'),
+    path('deletebusinessmodal/<int:business_id>', views.delete_business_modal, name='deletebusinessmodal'),
+    path('deletestaffmodal/<int:staff_id>', views.delete_staff_modal, name='deletestaffmodal'),
+    path('deleteprojectmodal/<int:project_id>', views.delete_project_modal, name='deleteprojectmodal'),
+    path('deletetaskmodal/<int:task_id>', views.delete_task_modal, name='deletetaskmodal'),
+
     #Save Urls
     path('save_note/', views.save_note, name='save_note'),
     path('save_project/', views.save_project, name='save_project'),
@@ -129,6 +135,9 @@ urlpatterns = [
    #Fetch Urls
    path('getupdatedlaststatus/', views.get_updated_last_status, name='getupdatedlaststatus'),
    path('getupdatedactivities/', views.get_latest_activities, name='getupdatedactivities'),
+
+    # TO FETCH THE EPICS OF THE SELECTED PROJECT WHEN EDITING A TASK
+   path('fetch_epics/', views.fetch_epics, name='fetch_epics'),
 ]
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

osinaweb/static/dist/output.css

@@ -866,6 +866,10 @@ video {
   height: 13px;
 }
 
+.h-\[140px\] {
+  height: 140px;
+}
+
 .h-\[150px\] {
   height: 150px;
 }
@@ -939,10 +943,6 @@ video {
   width: 12rem;
 }
 
-.w-\[100px\] {
-  width: 100px;
-}
-
 .w-\[120px\] {
   width: 120px;
 }

osinaweb/static/js/fetch-epics-in-edit-task.js

@@ -0,0 +1,32 @@
+$(document).ready(function () {
+    // Display the epic based on the selected project by default
+    updateEpicDropdown();
+
+    // Update the "Epic" dropdown when the "Project" dropdown changes
+    $('#projectDropdown').on('change', function () {
+        updateEpicDropdown();
+    });
+
+    function updateEpicDropdown() {
+        var selectedProjectId = $('#projectDropdown').val();
+
+        $.ajax({
+            url: '/fetch_epics/',
+            method: 'GET',
+            data: { project_id: selectedProjectId },
+            success: function (data) {
+                // Clear existing options
+                $('#epicDropdown').empty();
+
+                // Add the new options based on the fetched data
+                $.each(data.epics, function (index, epic) {
+                    var selected = (epic.id == '{{ task.epic.id }}') ? 'selected' : '';
+                    $('#epicDropdown').append('<option value="' + epic.id + '" ' + selected + '>' + epic.title + '</option>');
+                });
+            },
+            error: function () {
+                console.log('Error fetching epics');
+            }
+        });
+    }
+});

osinaweb/static/js/pop-modals.js

@@ -63,6 +63,16 @@ document.addEventListener("DOMContentLoaded", function () {
     addButtonClickListener("addStatusButtonMobile", "500px", "80px");
     addButtonClickListener("userRecentActivitiesButton", "400px", "600px");
     
+
+    // DELETE BUTTONS
+    addButtonClickListener("deleteCustomerButton", "400px", "140px");
+    addButtonClickListener("deleteBusinessButton", "400px", "140px");
+    addButtonClickListener("deleteStaffButton", "400px", "140px");
+    addButtonClickListener("deleteProjectButton", "400px", "140px");
+    addButtonClickListener("deleteTaskButton", "400px", "140px");
+    
+    
+    
     
     
 

osinaweb/templates/add_pages/add-business.html

@@ -13,14 +13,12 @@
         <form method="POST" action="{% url 'save_business' %}" enctype="multipart/form-data">
             {% csrf_token %}
             <input name="name" type="text" placeholder="Name"
-                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4"
-                required>
+                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" required>
 
             <div class="inbox-box border border-gray-300 py-1 px-3 w-full rounded-md mt-4">
                 <div class="flex items-center justify-between">
-                    <input name="logo" required type="file" id="actual-btn" accept="image/*" hidden/>
-                    <span id="file-name"
-                        class="text-gray-500 text-base focus:outline-none outline-none">Upload Business
+                    <input name="logo" required type="file" id="actual-btn" accept="image/*" hidden />
+                    <span id="file-name" class="text-gray-500 text-base focus:outline-none outline-none">Upload Business
                         Logo</span>
                     <label for="actual-btn"
                         class="bg-transparent text-gray-500 border border-white px-4 py-2 h-14 cursor-pointer flex items-center"><i
@@ -46,19 +44,17 @@
             </script>
 
             <input name="email" type="email" placeholder="Email"
-                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4"
-                required>
+                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" required>
 
             <input name="financial_number" type="number" placeholder="Financial Number"
-                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4"
-                required>
+                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" required>
 
 
             <div class="w-full flex justify-start items-center gap-2 mt-4">
                 <input name="vat" type="checkbox" id="vatCheckbox" onchange="updateVatValue(this.checked)">
                 <label class="text-slate-800">Vat</label>
             </div>
-          
+
 
             <script>
                 function updateVatValue(checked) {
@@ -68,35 +64,25 @@
             </script>
 
             <input name="commercial_registration" type="commercial_registration" placeholder="Commercial registration"
-                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4"
-                required>
+                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" required>
 
             <input name="phone_number" type="number" placeholder="Mobile Number"
-                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4"
-                required>
+                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" required>
 
             <input name="website" type="text" placeholder="Website"
                 class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4">
 
-
-            <select name="business_type" id=""
+            <select name="type" id="business_type"
                 class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-4">
                 <option value="" selected disabled>Business Type</option>
-                <option value="ASSOCIATIONS">Associations</option>
-                <option value="HEALTHCARE">Healthcare</option>
-                <option value="LUXURY">Luxury</option>
-                <option value="MANUFACTURING">Manufacturing</option>
-                <option value="NON-PROFIT">Non-Profit</option>
-                <option value="Education">Education</option>
-                <option value="ENTERTAINMENT">Entertainment</option>
-                <option value="LOGISTICS">Logistics</option>
-                <option value="RETAIL">Retail</option>
-                <option value="AUTOMOTIVE">Automotive</option>
+                {% for business_type in business_types %}
+                <option value="{{ business_type.id }}">{{ business_type.name }}</option>
+                {% endfor %}
             </select>
 
             <div class="w-full flex justify-center items-center mt-3">
                 <button type="submit"
-                    class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-base s:text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
+                    class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
                     Business</button>
             </div>
         </form>

osinaweb/templates/add_pages/add-customer.html

@@ -93,13 +93,13 @@
                 </script>
 
                 <input name="password1" type="password" placeholder="Password"
-                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md" required>
+                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md" required>
                 <input name="password2" type="password" placeholder="Password"
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md" required>
 
                 <div class="w-full flex justify-center items-center mt-3">
                     <button type="submit"
-                        class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-base s:text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
+                        class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
                         Customer</button>
                 </div>
             </div>
@@ -174,21 +174,15 @@
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4">
 
 
-                <select name="business_type" id=""
+                <select name="type" id="business_type"
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-4">
                     <option value="" selected disabled>Business Type</option>
-                    <option value="ASSOCIATIONS">Associations</option>
-                    <option value="HEALTHCARE">Healthcare</option>
-                    <option value="LUXURY">Luxury</option>
-                    <option value="MANUFACTURING">Manufacturing</option>
-                    <option value="NON-PROFIT">Non-Profit</option>
-                    <option value="Education">Education</option>
-                    <option value="ENTERTAINMENT">Entertainment</option>
-                    <option value="LOGISTICS">Logistics</option>
-                    <option value="RETAIL">Retail</option>
-                    <option value="AUTOMOTIVE">Automotive</option>
+                    {% for business_type in business_types %}
+                    <option value="{{ business_type.id }}">{{ business_type.name }}</option>
+                    {% endfor %}
                 </select>
 
+
                 <div class="w-full flex justify-center items-center mt-3">
                     <button type="submit"
                         class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-xl cursor-pointer hover:bg-white hover:text-blue-500"

osinaweb/templates/add_pages/add-daily-report.html

@@ -18,7 +18,7 @@
 
             <div class="w-full flex justify-center items-center mt-3">
                 <button type="submit"
-                    class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-base s:text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add</button>
+                    class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add</button>
             </div>
         </form>
     </div>

osinaweb/templates/add_pages/add-staff.html

@@ -128,7 +128,7 @@
 
                 <div class="w-full flex justify-center items-center mt-3">
                     <button type="submit"
-                        class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-base s:text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
+                        class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
                         Staff</button>
                 </div>
             </div>

osinaweb/templates/add_pages/create-epic.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full bg-white h-fit shadow-md rounded-md p-5">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Create Epic For {{project.name}}

osinaweb/templates/add_pages/create-project.html

@@ -120,7 +120,7 @@
             </div>
             <div class="w-full flex justify-center items-center mt-3">
                 <button type="submit"
-                    class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-base s:text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
+                    class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
                     Project</button>
             </div>
         </form>

osinaweb/templates/add_pages/create-task.html

@@ -99,7 +99,7 @@
 
             <div class="w-full flex justify-center items-center mt-3">
                 <button
-                    class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-base s:text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
+                    class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
                     Task</button>
             </div>
         </div>

osinaweb/templates/add_pages/createtask-epic.html

@@ -4,7 +4,7 @@
 
 <!-- IN THIS TASK FORM THE TASK ALREADY BELONG TO AN EPIC THAT BELONGS TO A PROJECT -->
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Create Task

osinaweb/templates/add_pages/createtask-project.html

@@ -4,7 +4,7 @@
 
 <!-- IN THIS TASK FORM THE TASK BELONG ONLY TO A PROJECT AND THE USER MUST CHOOSE TO WHICH EPIC IT BELONGS -->
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Create Task For {{project.name}}

osinaweb/templates/delete_modals/delete-business-modal.html

@@ -0,0 +1,30 @@
+{%load static%}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body>
+    <form id="hiddenContent" method="post" action="{% url 'deletebusinessmodal' business.id %}" target="_parent">
+        {% csrf_token %}
+
+        <div class="h-[140px] flex flex-col justify-center items-center">
+            <h1 class="text-slate-800 text-xl font-semibold text-center">Are you sure you want to delete this business?</h1>
+
+            <div class="w-full flex justify-center items-center mt-5 gap-5">
+                <button 
+                    class="w-fit bg-red-500 border border-red-500 rounded-md text-white text-base px-3 py-2 hover:bg-white hover:text-red-500">Delete</button>
+            </div>
+        </div>
+    </form>
+</body>
+
+</html>

osinaweb/templates/delete_modals/delete-customer-modal.html

@@ -0,0 +1,30 @@
+{%load static%}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body>
+    <form id="hiddenContent" method="post" action="{% url 'deletecustomermodal' customer.id %}" target="_parent">
+        {% csrf_token %}
+
+        <div class="h-[140px] flex flex-col justify-center items-center">
+            <h1 class="text-slate-800 text-xl font-semibold text-center">Are you sure you want to delete this customer?</h1>
+
+            <div class="w-full flex justify-center items-center mt-5 gap-5">
+                <button 
+                    class="w-fit bg-red-500 border border-red-500 rounded-md text-white text-base px-3 py-2 hover:bg-white hover:text-red-500">Delete</button>
+            </div>
+        </div>
+    </form>
+</body>
+
+</html>

osinaweb/templates/delete_modals/delete-project-modal.html

@@ -0,0 +1,30 @@
+{%load static%}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body>
+    <form id="hiddenContent" method="post" action="{% url 'deleteprojectmodal' project.id %}" target="_parent">
+        {% csrf_token %}
+
+        <div class="h-[140px] flex flex-col justify-center items-center">
+            <h1 class="text-slate-800 text-xl font-semibold text-center">Are you sure you want to delete this project?</h1>
+
+            <div class="w-full flex justify-center items-center mt-5 gap-5">
+                <button 
+                    class="w-fit bg-red-500 border border-red-500 rounded-md text-white text-base px-3 py-2 hover:bg-white hover:text-red-500">Delete</button>
+            </div>
+        </div>
+    </form>
+</body>
+
+</html>

osinaweb/templates/delete_modals/delete-staff-modal.html

@@ -0,0 +1,30 @@
+{%load static%}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body>
+    <form id="hiddenContent" method="post" action="{% url 'deletestaffmodal' staff.id %}" target="_parent">
+        {% csrf_token %}
+
+        <div class="h-[140px] flex flex-col justify-center items-center">
+            <h1 class="text-slate-800 text-xl font-semibold text-center">Are you sure you want to delete this staff?</h1>
+
+            <div class="w-full flex justify-center items-center mt-5 gap-5">
+                <button 
+                    class="w-fit bg-red-500 border border-red-500 rounded-md text-white text-base px-3 py-2 hover:bg-white hover:text-red-500">Delete</button>
+            </div>
+        </div>
+    </form>
+</body>
+
+</html>

osinaweb/templates/delete_modals/delete-task-modal.html

@@ -0,0 +1,30 @@
+{%load static%}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body>
+    <form id="hiddenContent" method="post" action="{% url 'deletetaskmodal' task.id %}" target="_parent">
+        {% csrf_token %}
+
+        <div class="h-[140px] flex flex-col justify-center items-center">
+            <h1 class="text-slate-800 text-xl font-semibold text-center">Are you sure you want to delete this task?</h1>
+
+            <div class="w-full flex justify-center items-center mt-5 gap-5">
+                <button 
+                    class="w-fit bg-red-500 border border-red-500 rounded-md text-white text-base px-3 py-2 hover:bg-white hover:text-red-500">Delete</button>
+            </div>
+        </div>
+    </form>
+</body>
+
+</html>

osinaweb/templates/details_pages/business-details.html

@@ -85,7 +85,7 @@
         <div class="w-full h-fit flex justify-end items-center bg-gray-100 shadow-md rounded-md px-3 py-3 mt-4">
             <div class="w-full s:w-fit flex flex-col s:flex-row justify-end items-center gap-3">
                 <button
-                    class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500">Delete
+                    class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 deleteBusinessButton" data-modal-url="{% url 'deletebusinessmodal' business.id %}">Delete
                     Business</button>
                 <a href="{% url 'editbusiness' business.business_id %}" class="w-full s:w-fit">
                     <button

osinaweb/templates/details_pages/customer-details.html

@@ -99,7 +99,8 @@
         <div class="w-full h-fit flex justify-end items-center bg-gray-100 shadow-md rounded-md px-3 py-3 mt-3">
             <div class="w-full s:w-fit flex flex-col s:flex-row justify-end items-center gap-3">
                 <button
-                    class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500">Delete
+                    class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 deleteCustomerButton"
+                    data-modal-url="{% url 'deletecustomermodal' customer.id %}">Delete
                     Customer</button>
                 <a href="{% url 'editcustomer' customer.customer_id %}" class="w-full s:w-fit">
                     <button
@@ -205,23 +206,23 @@
                     <!-- TABLE BODY -->
                     <tbody class="bg-white divide-y divide-gray-200">
                         <!-- 1st row -->
-                        {% if customer.business %}
+                        {% for business in customer.businesses.all %}
                         <tr>
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-slate-800">{{customer.business.name}}</p>
+                                <p class="text-slate-800">{{ business.name }}</p>
                             </td>
 
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-slate-800">{{customer.business.business_type}}</p>
+                                <p class="text-slate-800">{{ business.business_type }}</p>
                             </td>
 
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-slate-800">{{customer.business.financial_number}}</p>
+                                <p class="text-slate-800">{{ business.financial_number }}</p>
                             </td>
 
                             <td class="px-6 py-4 text-center text-sm">
                                 <div class="flex justify-center items-center gap-3">
-                                    <a href="{% url 'businessdetails' customer.business.business_id %}">
+                                    <a href="{% url 'businessdetails' business.business_id %}">
                                         <div class="text-[15px] text-blue-500 cursor-pointer">
                                             <i class="fa fa-edit"></i>
                                         </div>
@@ -239,13 +240,7 @@
                                 </div>
                             </td>
                         </tr>
-                        {% else %}
-                        <tr>
-                            <td colspan="3" class="px-6 py-4 text-center text-sm text-slate-800">
-                                No Business For {{customer.user.first_name}} {{customer.user.last_name}}
-                            </td>
-                        </tr>
-                        {% endif %}
+                        {% endfor %}
                     </tbody>
                 </table>
             </div>

osinaweb/templates/details_pages/project-details.html

@@ -107,7 +107,8 @@
         {% endif %}
         <div class="w-full rounded-b-md flex xll:hidden items-center">
             <button
-                class="w-[50%] text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-bl-md cursor-pointer hover:bg-white hover:text-red-500">Delete
+                class="w-[50%] text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-bl-md cursor-pointer hover:bg-white hover:text-red-500 deleteProjectButton"
+                data-modal-url="{% url 'deleteprojectmodal' project.id %}">Delete
                 Project</button>
             <a href="{% url 'editproject' project.project_id %}" class="w-[50%]">
                 <button
@@ -146,7 +147,8 @@
             </div>
             <div class="hidden xll:flex justify-end items-center gap-3">
                 <button
-                    class="w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500">Delete
+                    class="w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 deleteProjectButton"
+                    data-modal-url="{% url 'deleteprojectmodal' project.id %}">Delete
                     Project</button>
                 <a href="{% url 'editproject' project.project_id %}">
                     <button
@@ -375,6 +377,73 @@
                 </div>
             </div>
 
+            <!-- RELATED FILES -->
+            <div class="w-full mt-5">
+                <div class="overflow-x-auto border border-gray-300 rounded-md mt-5" id="customersContainer">
+                    <div
+                        class=" bg-slate-700 border border-slate-700 rounded-t-md flex justify-between items-center text-white text-xl font-bold h-[50px]">
+                        <div class="px-3">
+                            <p class="text-white uppercase font-bold">Related files</p>
+                        </div>
+
+                        <button
+                            class="h-full rounded-tr-md px-4 bg-gray-300 text-slate-700 text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addFileButton"
+                            data-modal-url="{% url 'addfile' %}">
+                            <i class="fa fa-plus"></i>
+                        </button>
+                    </div>
+
+                    <table class="min-w-full divide-y">
+                        <!-- TABLE HEADER -->
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th scope="col"
+                                    class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                    File Name
+                                </th>
+                                <th scope="col"
+                                    class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                    File
+                                </th>
+                                <th scope="col"
+                                    class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
+                                    Date Entered
+                                </th>
+                            </tr>
+                        </thead>
+
+                        <!-- TABLE BODY -->
+                        <tbody class="bg-white divide-y divide-gray-200">
+                            <!-- 1st row -->
+                            {% if project.projectfile_set.all %}
+                            {% for file in project.projectfile_set.all %}
+                            <tr>
+                                <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                    <p class="text-slate-800">{{file.name}}</p>
+                                </td>
+
+                                <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                    <a class="text-slate-800">{{file.file}}</a>
+                                </td>
+
+                                <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                    <a class="text-slate-800">{{file.date}}</a>
+                                </td>
+                            </tr>
+                            {% endfor %}
+                            {% else %}
+                            <tr>
+                                <td colspan="3" class="px-6 py-4 text-center text-sm text-slate-800">
+                                    No Available Files
+                                </td>
+                            </tr>
+                            {% endif %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+
 
             <!-- TAGS -->
             <div>

osinaweb/templates/details_pages/staff-details.html

@@ -86,7 +86,7 @@
         <div class="w-full h-fit flex justify-end items-center bg-gray-100 shadow-md rounded-md px-3 py-3 mt-4">
             <div class="w-full s:w-fit flex flex-col s:flex-row justify-end items-center gap-3">
                 <button
-                    class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500">Delete
+                    class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 deleteStaffButton" data-modal-url="{% url 'deletestaffmodal' staff.id %}" >Delete
                     User</button>
                 <a href="{% url 'editstaff' staff.staff_id %}" class="w-full s:w-fit">
                     <button

osinaweb/templates/details_pages/task-details.html

@@ -94,7 +94,7 @@
         <div class="w-full h-fit flex justify-end items-center bg-gray-100 shadow-md rounded-md px-3 py-3 mt-4">
             <div class="w-full s:w-fit flex flex-col s:flex-row justify-end items-center gap-3">
                 <button
-                    class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500">Delete
+                    class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 deleteTaskButton" data-modal-url="{% url 'deletetaskmodal' task.id %}">Delete
                     Task</button>
                 <a href="{% url 'edittask' task.task_id %}" class="w-full s:w-fit">
                     <button
@@ -128,8 +128,8 @@
 
             <div>
                 <p class="text-gray-500 text-xl">Assigned To: <span
-                        class="text-slate-800 text-xl font-semibold">{{task.assigned_to.first_name}}
-                        {{task.assigned_to.last_name}}</span></p>
+                        class="text-slate-800 text-xl font-semibold">{{task.assigned_to.user.first_name}}
+                        {{task.assigned_to.user.last_name}}</span></p>
             </div>
 
             <div>

osinaweb/templates/edit_pages/edit-business-type.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Business Type

osinaweb/templates/edit_pages/edit-business.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Business
@@ -13,7 +13,7 @@
 
         
         <div class="w-full flex flex-col gap-3 justify-center items-center mt-5">
-            <div class="w-[100px] h-[100px] rounded-full border border-gray-200 mt-2" id="image-container">
+            <div class="w-[70px] s:w-[100px] h-[70px] s:h-[100px] rounded-full border border-gray-200 mt-2" id="image-container">
                 {% if business.logo %}
                     <img src="{{business.logo.url}}" alt="" srcset="" id="" class="rounded-full w-full h-full">
                     {% else %}

osinaweb/templates/edit_pages/edit-customer.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Customer

osinaweb/templates/edit_pages/edit-project-type.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Project Type

osinaweb/templates/edit_pages/edit-project.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Project

osinaweb/templates/edit_pages/edit-reference.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Reference

osinaweb/templates/edit_pages/edit-staff-position.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Staff Position

osinaweb/templates/edit_pages/edit-staff.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Staff
@@ -11,7 +11,7 @@
         <form method="POST" action="{% url 'editstaff' staff.staff_id %}" enctype="multipart/form-data">
             {% csrf_token %}
             <div class="w-full flex flex-col gap-3 justify-center items-center mt-5">
-                <div class="w-[100px] h-[100px] rounded-full border border-gray-200 mt-2" id="image-container">
+                <div class="w-[70px] s:w-[100px] h-[70px] s:h-[100px] rounded-full border border-gray-200 mt-2" id="image-container">
                     {% if staff.image %}
                     <img src="{{staff.image.url}}" alt="" srcset="" id="" class="rounded-full w-full h-full">
                     {% else %}

osinaweb/templates/edit_pages/edit-tag.html

@@ -2,7 +2,7 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Tag

osinaweb/templates/edit_pages/edit-task.html

@@ -2,14 +2,14 @@
 {%load static%}
 {% block content %}
 
-<div class="w-full px-10 mb-4">
+<div class="w-full px-5 s:px-9 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
             Edit Task
         </h1>
 
         <form class="w-full flex flex-col gap-3 justify-center items-center mt-5" method="POST"
-            action="{% url 'save_task' %}">
+            action="{% url 'edittask' task.task_id %}">
             {% csrf_token %}
             <div class="w-full mt-4">
                 <label class="text-gray-500 text-xl">Name:</label>
@@ -20,22 +20,21 @@
 
             <div class="w-full mt-4">
                 <label class="text-gray-500 text-xl">Project:</label>
-                <select required name="project" id=""
+                <select required name="project" id="projectDropdown"
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-2">
                     {% for project in projects %}
                     <option value="{{project.id}}" {% if project.id == task.project.id %} selected {% endif %}>{{project.name}}</option>
                     {% endfor %}
                 </select>
             </div>
-
+            
             <div class="w-full mt-4">
                 <label class="text-gray-500 text-xl">Epic:</label>
-                <select required name="epic" id=""
+                <select required name="epic" id="epicDropdown"
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-2">
                     <option value="" disabled>Select Epic</option>
-                    <option value="" selected>Epic1</option>
                     {% for epic in epics_of_my_project %}
-                    <option value="{{epic.id}}">{{epic.title}}</option>
+                    <option value="{{epic.id}}" {% if epic.id == task.epic.id %} selected {% endif %}>{{epic.title}}</option>
                     {% endfor %}
                 </select>
             </div>
@@ -56,9 +55,9 @@
                 <select name="assigned_to" required id=""
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-2">
                     <option value="" disabled>Assigned To</option>
-                    <option value="" selected>Nataly</option>
+                    <option value="{{task.staff.id}}" selected>{{task.staff.user.first_name}} {{task.staff.user.last_name}}</option>
                     {% for staff in staffs %}
-                    <option value="{{staff.id}}">{{staff.first_name}} {{staff.last_name}}</option>
+                    <option value="{{staff.id}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
                     {% endfor %}
                 </select>
             </div>
@@ -103,6 +102,13 @@
     </div>
 </div>
 </div>
+
+<!---------------------- JS SCRIPTS -------------------->
+<script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
+
+<script type="text/javascript" src='{% static "js/fetch-epics-in-edit-task.js" %}'></script>
+
+
 <!-- POPUP MODAL -->
 <div class="w-full h-full bg-black bg-opacity-40 z-20 fixed justify-center items-center hidden" id="popUpModal">
     <div class="w-[95%] md:w-fit h-fit bg-white rounded-md p-9 relative">

osinaweb/templates/index.html

@@ -204,7 +204,7 @@
 
                             <button
                                 class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 deleteTaskButton"
-                                data-modal-url="{% url 'deletetask' %}">Delete</button>
+                                data-modal-url="{% url 'deletetaskmodal' task.id %}">Delete</button>
 
                             <a href="{% url 'edittask' task.task_id %}">
                                 <button
@@ -350,8 +350,8 @@
                             Time</button>
 
                         <button
-                            class="p-2 border border-gray-200 text-sm h-[70px] bg-gray-100 text-gray-500 deleteTaskButton"
-                            data-modal-url="{% url 'deletetask' %}">Delete</button>
+                            class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 deleteTaskButton"
+                            data-modal-url="{% url 'deletetaskmodal' task.id %}">Delete</button>
 
                         <a href="{% url 'edittask' task.task_id %}">
                             <button

osinaweb/templates/listing_pages/businesses.html

@@ -171,7 +171,7 @@
                                             <i class="fa fa-edit"></i>
                                         </div>
                                     </a>
-                                    <div class="text-[15px] text-red-500 cursor-pointer">
+                                    <div class="text-[15px] text-red-500 cursor-pointer deleteBusinessButton" data-modal-url="{% url 'deletebusinessmodal' business.id %}">
                                         <i class="fa fa-trash"></i>
                                     </div>
                                 </div>

osinaweb/templates/listing_pages/customers.html

@@ -66,18 +66,6 @@
                         </div>
                         {% endfor %}
                     </div>
-
-                    <!-- <div class="flex justify-center items-center gap-3 mt-5">
-                        <div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
-                            id="sliderLeft">
-                            <i class="fa fa-angle-left"></i>
-                        </div>
-
-                        <div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
-                            id="sliderRight">
-                            <i class="fa fa-angle-right"></i>
-                        </div>
-                    </div> -->
                 </div>
             </div>
         </div>
@@ -190,7 +178,7 @@
                                         </div>
                                     </a>
 
-                                    <div class="text-[15px] text-red-500 cursor-pointer">
+                                    <div class="text-[15px] text-red-500 cursor-pointer deleteCustomerButton" data-modal-url="{% url 'deletecustomermodal' customer.id %}">
                                         <i class="fa fa-trash"></i>
                                     </div>
                                 </div>

osinaweb/templates/listing_pages/projects.html

@@ -67,18 +67,6 @@
                         </div>
                         {% endfor %}
                     </div>
-
-                    <!-- <div class="flex justify-center items-center gap-3 mt-5">
-                        <div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
-                            id="sliderLeft">
-                            <i class="fa fa-angle-left"></i>
-                        </div>
-
-                        <div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
-                            id="sliderRight">
-                            <i class="fa fa-angle-right"></i>
-                        </div>
-                    </div> -->
                 </div>
             </div>
         </div>
@@ -205,7 +193,7 @@
                                             <i class="fa fa-edit"></i>
                                         </div>
                                     </a>
-                                    <div class="text-[15px] text-red-500 cursor-pointer">
+                                    <div class="text-[15px] text-red-500 cursor-pointer deleteProjectButton" data-modal-url="{% url 'deleteprojectmodal' project.id %}">
                                         <i class="fa fa-trash"></i>
                                     </div>
                                 </div>

osinaweb/templates/listing_pages/staffs.html

@@ -67,18 +67,6 @@
                         </div>
                         {% endfor %}
                     </div>
-
-                    <!-- <div class="flex justify-center items-center gap-3 mt-5">
-                        <div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
-                            id="sliderLeft">
-                            <i class="fa fa-angle-left"></i>
-                        </div>
-
-                        <div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
-                            id="sliderRight">
-                            <i class="fa fa-angle-right"></i>
-                        </div>
-                    </div> -->
                 </div>
             </div>
         </div>
@@ -165,7 +153,7 @@
                                             <i class="fa fa-edit"></i>
                                         </div>
                                     </a>
-                                    <div class="text-[15px] text-red-500 cursor-pointer">
+                                    <div class="text-[15px] text-red-500 cursor-pointer deleteStaffButton" data-modal-url="{% url 'deletestaffmodal' staff.id %}">
                                         <i class="fa fa-trash"></i>
                                     </div>
                                 </div>

osinaweb/templates/listing_pages/tasks.html

@@ -65,18 +65,6 @@
                         </div>
                         {% endfor %}
                     </div>
-
-                    <!-- <div class="flex justify-center items-center gap-3 mt-5">
-                        <div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
-                            id="sliderLeft">
-                            <i class="fa fa-angle-left"></i>
-                        </div>
-
-                        <div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
-                            id="sliderRight">
-                            <i class="fa fa-angle-right"></i>
-                        </div>
-                    </div> -->
                 </div>
             </div>
         </div>
@@ -91,7 +79,8 @@
             <h1 class="text-slate-800 text-[30px] font-semibold">My Tasks</h1>
 
             <!-- TASK FILTERING -->
-            <div class="w-full py-4 px-3 bg-gray-200 rounded-md shadow-md mt-4 flex flex-col l:flex-row justify-between gap-3 items-center">
+            <div
+                class="w-full py-4 px-3 bg-gray-200 rounded-md shadow-md mt-4 flex flex-col l:flex-row justify-between gap-3 items-center">
                 <div class="w-full l:w-fit flex flex-col l:flex-row justify-start items-center gap-3">
                     <div class="relative h-fit w-full l:w-fit flex items-center">
                         <input type="text" placeholder="Enter Project Name"
@@ -200,7 +189,7 @@
 
                                 {% if task.status == 'Closed' %}
                                 <div
-                                class="flex justify-center items-center border-b border-gray-200 text-white bg-green-700 rounded-tr-md">
+                                    class="flex justify-center items-center border-b border-gray-200 text-white bg-green-700 rounded-tr-md">
                                     <p>{{task.formatted_end_date}}</p>
                                 </div>
                                 {% endif %}
@@ -263,7 +252,7 @@
 
                                 <button
                                     class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 deleteTaskButton"
-                                    data-modal-url="{% url 'deletetask' %}">Delete</button>
+                                    data-modal-url="{% url 'deletetaskmodal' task.id %}">Delete</button>
 
                                 <a href="{% url 'edittask' task.task_id %}">
                                     <button
@@ -331,7 +320,7 @@
                                 <p>{{task.status}}</p>
                             </div>
                             {% endif %}
-                            
+
                             {% if task.status == 'Open' %}
                             <div
                                 class="text-white bg-red-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
@@ -439,8 +428,8 @@
                                 Time</button>
 
                             <button
-                                class="p-2 border border-gray-200 text-sm h-[70px] bg-gray-100 text-gray-500 deleteTaskButton"
-                                data-modal-url="{% url 'deletetask' %}">Delete</button>
+                                class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 deleteTaskButton"
+                                data-modal-url="{% url 'deletetaskmodal' task.id %}">Delete</button>
 
                             <a href="{% url 'edittask' task.task_id %}">
                                 <button

osinaweb/templates/popup_modals/deletetask-modal.html

@@ -1,26 +0,0 @@
-{% load static %}
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Osina</title>
-
-    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
-</head>
-
-<body>
-    <div id="hiddenContent">
-        <h1 class="text-slate-800 text-2xl font-semibold text-center">Are you sure you want to delete this task?</h1>
-
-        <div class="w-full flex justify-center items-center mt-4 gap-5">
-            <button
-                class="w-[100px] bg-red-500 border border-red-500 rounded-md text-white text-xl px-3 py-2 hover:bg-white hover:text-red-500" id="noDeleteTaskBttn">Delete</button>
-        </div>
-    </div>
-</body>
-
-</html>