diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 56d2ec67..5a877bdd 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc index c87b53ee..fc8d043e 100644 Binary files a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index 165247bd..48899b12 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/0048_alter_customerprofile_business.py b/osinaweb/osinacore/migrations/0048_alter_customerprofile_business.py new file mode 100644 index 00000000..1eb91aa6 --- /dev/null +++ b/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'), + ), + ] diff --git a/osinaweb/osinacore/migrations/0049_alter_customerprofile_business.py b/osinaweb/osinacore/migrations/0049_alter_customerprofile_business.py new file mode 100644 index 00000000..1d5f16cb --- /dev/null +++ b/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'), + ), + ] diff --git a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc new file mode 100644 index 00000000..44da24fb Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-311.pyc new file mode 100644 index 00000000..6ed4d1aa Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-311.pyc differ diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py index 83cf6719..8b5e76fa 100644 --- a/osinaweb/osinacore/models.py +++ b/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) diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index 71a23e86..f2771767 100644 --- a/osinaweb/osinacore/views.py +++ b/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) \ No newline at end of file diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index 6f9c63bd..088ef72a 100644 Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc differ diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py index 541e3b8f..6946ced2 100644 --- a/osinaweb/osinaweb/urls.py +++ b/osinaweb/osinaweb/urls.py @@ -77,7 +77,6 @@ urlpatterns = [ path('show-points//', 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/', views.user_recent_activities_modal, name='userrecentativities'), + #Delete Modals + path('deletecustomermodal/', views.delete_customer_modal, name='deletecustomermodal'), + path('deletebusinessmodal/', views.delete_business_modal, name='deletebusinessmodal'), + path('deletestaffmodal/', views.delete_staff_modal, name='deletestaffmodal'), + path('deleteprojectmodal/', views.delete_project_modal, name='deleteprojectmodal'), + path('deletetaskmodal/', 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) \ No newline at end of file diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index b26caf01..0fefbc05 100644 --- a/osinaweb/static/dist/output.css +++ b/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; } diff --git a/osinaweb/static/images/Screen_Shot_2024-01-09_at_3.35.07_PM.png b/osinaweb/static/images/Screen_Shot_2024-01-09_at_3.35.07_PM.png new file mode 100644 index 00000000..a6750286 Binary files /dev/null and b/osinaweb/static/images/Screen_Shot_2024-01-09_at_3.35.07_PM.png differ diff --git a/osinaweb/static/images/Screen_Shot_2024-01-09_at_3.59.55_PM.png b/osinaweb/static/images/Screen_Shot_2024-01-09_at_3.59.55_PM.png new file mode 100644 index 00000000..a07c53bf Binary files /dev/null and b/osinaweb/static/images/Screen_Shot_2024-01-09_at_3.59.55_PM.png differ diff --git a/osinaweb/static/images/Screen_Shot_2024-01-09_at_4.08.47_PM.png b/osinaweb/static/images/Screen_Shot_2024-01-09_at_4.08.47_PM.png new file mode 100644 index 00000000..a29384b8 Binary files /dev/null and b/osinaweb/static/images/Screen_Shot_2024-01-09_at_4.08.47_PM.png differ diff --git a/osinaweb/static/images/Screen_Shot_2024-01-12_at_3.31.35_PM.png b/osinaweb/static/images/Screen_Shot_2024-01-12_at_3.31.35_PM.png new file mode 100644 index 00000000..190b0c82 Binary files /dev/null and b/osinaweb/static/images/Screen_Shot_2024-01-12_at_3.31.35_PM.png differ diff --git a/osinaweb/static/js/fetch-epics-in-edit-task.js b/osinaweb/static/js/fetch-epics-in-edit-task.js new file mode 100644 index 00000000..7ad930e7 --- /dev/null +++ b/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(''); + }); + }, + error: function () { + console.log('Error fetching epics'); + } + }); + } +}); diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index 1b7d03d2..48e093ea 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/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"); + + + diff --git a/osinaweb/templates/add_pages/add-business.html b/osinaweb/templates/add_pages/add-business.html index b91fc51d..f9e30c09 100644 --- a/osinaweb/templates/add_pages/add-business.html +++ b/osinaweb/templates/add_pages/add-business.html @@ -13,14 +13,12 @@
{% csrf_token %} + class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" required>
- - Upload Business + + Upload Business Logo
@@ -174,21 +174,15 @@ class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4"> - +
+ 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
diff --git a/osinaweb/templates/add_pages/add-staff.html b/osinaweb/templates/add_pages/add-staff.html index 1e1b347d..3f7b81ba 100644 --- a/osinaweb/templates/add_pages/add-staff.html +++ b/osinaweb/templates/add_pages/add-staff.html @@ -128,7 +128,7 @@
diff --git a/osinaweb/templates/add_pages/create-epic.html b/osinaweb/templates/add_pages/create-epic.html index 78eb42ee..61d23ffe 100644 --- a/osinaweb/templates/add_pages/create-epic.html +++ b/osinaweb/templates/add_pages/create-epic.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Create Epic For {{project.name}} diff --git a/osinaweb/templates/add_pages/create-project.html b/osinaweb/templates/add_pages/create-project.html index 7fd15cac..d0711824 100644 --- a/osinaweb/templates/add_pages/create-project.html +++ b/osinaweb/templates/add_pages/create-project.html @@ -120,7 +120,7 @@

diff --git a/osinaweb/templates/add_pages/create-task.html b/osinaweb/templates/add_pages/create-task.html index f77f8e31..d9f2df18 100644 --- a/osinaweb/templates/add_pages/create-task.html +++ b/osinaweb/templates/add_pages/create-task.html @@ -99,7 +99,7 @@
diff --git a/osinaweb/templates/add_pages/createtask-epic.html b/osinaweb/templates/add_pages/createtask-epic.html index 29394ffc..e871b3eb 100644 --- a/osinaweb/templates/add_pages/createtask-epic.html +++ b/osinaweb/templates/add_pages/createtask-epic.html @@ -4,7 +4,7 @@ -
+

Create Task diff --git a/osinaweb/templates/add_pages/createtask-project.html b/osinaweb/templates/add_pages/createtask-project.html index 2cf31093..77475946 100644 --- a/osinaweb/templates/add_pages/createtask-project.html +++ b/osinaweb/templates/add_pages/createtask-project.html @@ -4,7 +4,7 @@ -
+

Create Task For {{project.name}} diff --git a/osinaweb/templates/delete_modals/delete-business-modal.html b/osinaweb/templates/delete_modals/delete-business-modal.html new file mode 100644 index 00000000..28b5f028 --- /dev/null +++ b/osinaweb/templates/delete_modals/delete-business-modal.html @@ -0,0 +1,30 @@ +{%load static%} + + + + + + + + + + + + + + +
+ {% csrf_token %} + +
+

Are you sure you want to delete this business?

+ +
+ +
+
+
+ + + \ No newline at end of file diff --git a/osinaweb/templates/delete_modals/delete-customer-modal.html b/osinaweb/templates/delete_modals/delete-customer-modal.html new file mode 100644 index 00000000..fe4fe93a --- /dev/null +++ b/osinaweb/templates/delete_modals/delete-customer-modal.html @@ -0,0 +1,30 @@ +{%load static%} + + + + + + + + + + + + + + +
+ {% csrf_token %} + +
+

Are you sure you want to delete this customer?

+ +
+ +
+
+
+ + + \ No newline at end of file diff --git a/osinaweb/templates/delete_modals/delete-project-modal.html b/osinaweb/templates/delete_modals/delete-project-modal.html new file mode 100644 index 00000000..3afe0b67 --- /dev/null +++ b/osinaweb/templates/delete_modals/delete-project-modal.html @@ -0,0 +1,30 @@ +{%load static%} + + + + + + + + + + + + + + +
+ {% csrf_token %} + +
+

Are you sure you want to delete this project?

+ +
+ +
+
+
+ + + \ No newline at end of file diff --git a/osinaweb/templates/delete_modals/delete-staff-modal.html b/osinaweb/templates/delete_modals/delete-staff-modal.html new file mode 100644 index 00000000..1dd4cc0a --- /dev/null +++ b/osinaweb/templates/delete_modals/delete-staff-modal.html @@ -0,0 +1,30 @@ +{%load static%} + + + + + + + + + + + + + + +
+ {% csrf_token %} + +
+

Are you sure you want to delete this staff?

+ +
+ +
+
+
+ + + \ No newline at end of file diff --git a/osinaweb/templates/delete_modals/delete-task-modal.html b/osinaweb/templates/delete_modals/delete-task-modal.html new file mode 100644 index 00000000..01f6d1c3 --- /dev/null +++ b/osinaweb/templates/delete_modals/delete-task-modal.html @@ -0,0 +1,30 @@ +{%load static%} + + + + + + + + + + + + + + +
+ {% csrf_token %} + +
+

Are you sure you want to delete this task?

+ +
+ +
+
+
+ + + \ No newline at end of file diff --git a/osinaweb/templates/details_pages/business-details.html b/osinaweb/templates/details_pages/business-details.html index 93b33d62..fa81ed98 100644 --- a/osinaweb/templates/details_pages/business-details.html +++ b/osinaweb/templates/details_pages/business-details.html @@ -85,7 +85,7 @@
diff --git a/osinaweb/templates/details_pages/project-details.html b/osinaweb/templates/details_pages/project-details.html index aa4675d8..26259b29 100644 --- a/osinaweb/templates/details_pages/project-details.html +++ b/osinaweb/templates/details_pages/project-details.html @@ -107,7 +107,8 @@ {% endif %}
+ +
+
+
+
+

Related files

+
+ + +
+ + + + + + + + + + + + + + + {% if project.projectfile_set.all %} + {% for file in project.projectfile_set.all %} + + + + + + + + {% endfor %} + {% else %} + + + + {% endif %} + +
+ File Name + + File + + Date Entered +
+

{{file.name}}

+ 		+ {{file.file}} + + {{file.date}} +
+ No Available Files +
+
+
+ +
diff --git a/osinaweb/templates/details_pages/staff-details.html b/osinaweb/templates/details_pages/staff-details.html index 8f1f3bc6..6a92418b 100644 --- a/osinaweb/templates/details_pages/staff-details.html +++ b/osinaweb/templates/details_pages/staff-details.html @@ -86,7 +86,7 @@
diff --git a/osinaweb/templates/edit_pages/edit-business-type.html b/osinaweb/templates/edit_pages/edit-business-type.html index f8f89a74..afa7ac3e 100644 --- a/osinaweb/templates/edit_pages/edit-business-type.html +++ b/osinaweb/templates/edit_pages/edit-business-type.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Business Type diff --git a/osinaweb/templates/edit_pages/edit-business.html b/osinaweb/templates/edit_pages/edit-business.html index fde41d7a..38ec4857 100644 --- a/osinaweb/templates/edit_pages/edit-business.html +++ b/osinaweb/templates/edit_pages/edit-business.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Business @@ -13,7 +13,7 @@
-
+
{% if business.logo %} {% else %} diff --git a/osinaweb/templates/edit_pages/edit-customer.html b/osinaweb/templates/edit_pages/edit-customer.html index 2dfb4e8a..d8abc494 100644 --- a/osinaweb/templates/edit_pages/edit-customer.html +++ b/osinaweb/templates/edit_pages/edit-customer.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Customer diff --git a/osinaweb/templates/edit_pages/edit-project-type.html b/osinaweb/templates/edit_pages/edit-project-type.html index ce9a63ea..efbfe037 100644 --- a/osinaweb/templates/edit_pages/edit-project-type.html +++ b/osinaweb/templates/edit_pages/edit-project-type.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Project Type diff --git a/osinaweb/templates/edit_pages/edit-project.html b/osinaweb/templates/edit_pages/edit-project.html index 6113a36a..2901e688 100644 --- a/osinaweb/templates/edit_pages/edit-project.html +++ b/osinaweb/templates/edit_pages/edit-project.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Project diff --git a/osinaweb/templates/edit_pages/edit-reference.html b/osinaweb/templates/edit_pages/edit-reference.html index 72c7e8e6..1823cb8b 100644 --- a/osinaweb/templates/edit_pages/edit-reference.html +++ b/osinaweb/templates/edit_pages/edit-reference.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Reference diff --git a/osinaweb/templates/edit_pages/edit-staff-position.html b/osinaweb/templates/edit_pages/edit-staff-position.html index c480f5d0..302bdc82 100644 --- a/osinaweb/templates/edit_pages/edit-staff-position.html +++ b/osinaweb/templates/edit_pages/edit-staff-position.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Staff Position diff --git a/osinaweb/templates/edit_pages/edit-staff.html b/osinaweb/templates/edit_pages/edit-staff.html index 439daff3..b5bfea12 100644 --- a/osinaweb/templates/edit_pages/edit-staff.html +++ b/osinaweb/templates/edit_pages/edit-staff.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Staff @@ -11,7 +11,7 @@
{% csrf_token %}
-
+
{% if staff.image %} {% else %} diff --git a/osinaweb/templates/edit_pages/edit-tag.html b/osinaweb/templates/edit_pages/edit-tag.html index 0b631bb8..758c225e 100644 --- a/osinaweb/templates/edit_pages/edit-tag.html +++ b/osinaweb/templates/edit_pages/edit-tag.html @@ -2,7 +2,7 @@ {%load static%} {% block content %} -
+

Edit Tag diff --git a/osinaweb/templates/edit_pages/edit-task.html b/osinaweb/templates/edit_pages/edit-task.html index 5d577580..cc15a27c 100644 --- a/osinaweb/templates/edit_pages/edit-task.html +++ b/osinaweb/templates/edit_pages/edit-task.html @@ -2,14 +2,14 @@ {%load static%} {% block content %} -
+

Edit Task

+ action="{% url 'edittask' task.task_id %}"> {% csrf_token %}
@@ -20,22 +20,21 @@
-
- +
-
@@ -56,9 +55,9 @@
@@ -103,6 +102,13 @@
+ + + + + + + {% endfor %}

- -
@@ -190,7 +178,7 @@
-
+
diff --git a/osinaweb/templates/listing_pages/projects.html b/osinaweb/templates/listing_pages/projects.html index 983b8a35..8d6e14eb 100644 --- a/osinaweb/templates/listing_pages/projects.html +++ b/osinaweb/templates/listing_pages/projects.html @@ -67,18 +67,6 @@
{% endfor %}

- -

@@ -205,7 +193,7 @@
-
+
diff --git a/osinaweb/templates/listing_pages/staffs.html b/osinaweb/templates/listing_pages/staffs.html index a6dd82dc..c106fa89 100644 --- a/osinaweb/templates/listing_pages/staffs.html +++ b/osinaweb/templates/listing_pages/staffs.html @@ -67,18 +67,6 @@
{% endfor %}

- -

@@ -165,7 +153,7 @@
-
+
diff --git a/osinaweb/templates/listing_pages/tasks.html b/osinaweb/templates/listing_pages/tasks.html index bda76863..d5cdde71 100644 --- a/osinaweb/templates/listing_pages/tasks.html +++ b/osinaweb/templates/listing_pages/tasks.html @@ -65,18 +65,6 @@
{% endfor %}

- -

@@ -91,7 +79,8 @@

My Tasks

-
+
+ class="flex justify-center items-center border-b border-gray-200 text-white bg-green-700 rounded-tr-md">

{{task.formatted_end_date}}

{% endif %} @@ -263,7 +252,7 @@ + data-modal-url="{% url 'deletetaskmodal' task.id %}">Delete
{% endif %} - + {% if task.status == 'Open' %}
@@ -439,8 +428,8 @@ Time + 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 -
-
- - - \ No newline at end of file