diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index d8e3d4d2..8b38b2f3 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc index 69980246..cd567238 100644 Binary files a/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc index 795f5bbc..f2484513 100644 Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/apps.cpython-311.pyc b/osinaweb/osinacore/__pycache__/apps.cpython-311.pyc index 1580369d..71747d5c 100644 Binary files a/osinaweb/osinacore/__pycache__/apps.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/apps.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc index 1ad246cb..7cb327b8 100644 Binary files a/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc b/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc index 75d1721a..b22d2dc8 100644 Binary files a/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc index 94c19d53..e8fa5c2d 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 a06b3aba..ab8b1dc8 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/__pycache__/0001_initial.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-311.pyc index fac9030e..516a219b 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-311.pyc index afb02dd8..aedcd9e0 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-311.pyc index 1ce75ccc..5d8f46c4 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-311.pyc index 26cf478b..ebc3a91a 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-311.pyc index 7a019e06..db5ae7e7 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-311.pyc index 7aae184b..eeb590b3 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-311.pyc index 8b3d1ed2..780341fa 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-311.pyc index 2cfb18de..73e6f7ca 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc index 990242f9..2a7c0ac2 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-311.pyc index d568ee9a..dee6f261 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-311.pyc index 5b455346..ae2b669b 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc index 8acd7cbf..3dfb1b84 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc index 43253d7a..e192d90a 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc index fc232d6d..eb695982 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc index 9823ac79..a5bb1db4 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc index bd64b0cc..36541a91 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc index c1b6371f..914b201b 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-311.pyc index 2f072f1f..982b3f8f 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc index 9bfb0b15..56145d62 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc index 36a9d0cb..faf407dd 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc index 6c0c696c..242513be 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc index 29ece30d..ec82bf89 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc index 875d363b..997ce660 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc index 844a8e95..9724e225 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc index 555e7e83..785e5b86 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-311.pyc index b36c1748..12e83060 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc index 93cd5ef6..a0d8a173 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-311.pyc new file mode 100644 index 00000000..8b6f095c Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc new file mode 100644 index 00000000..a90084e8 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc new file mode 100644 index 00000000..dc4216a2 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-311.pyc new file mode 100644 index 00000000..2fb939cc Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc index 0d002f1f..665bc290 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc differ diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index 8729cb5c..8c5887bd 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -260,6 +260,15 @@ def staffdetails(request): return render(request, 'staff-details.html', context) +@login_required +def staff_positions(request): + + context = { + + + } + return render(request, 'staff-positions.html', context) + @login_required def staffs(request): @@ -420,6 +429,31 @@ def add_business_modal(request, *args, **kwargs): } return render(request, 'addbusiness-modal.html', context) +def staff_position_modal(request): + + context = { + + + } + return render(request, 'add-staffposition-modal.html', context) + +def daily_reports(request): + + context = { + + + } + return render(request, 'daily-reports.html', context) + + +def add_daily_report(request): + + context = { + + + } + return render(request, 'add-daily-report.html', context) + @@ -623,7 +657,12 @@ def save_business(request): email= request.POST.get('email') financial_number = request.POST.get('financial_number') phone_number = request.POST.get('phone_number') + # vat = request.POST.get('vat') vat = request.POST.get('vat') + if vat == 'true': + vat = True + else: + vat = False commercial_registration = request.POST.get('commercial_registration') website = request.POST.get('website') business_type = request.POST.get('business_type') @@ -653,6 +692,10 @@ def save_business_modal(request): financial_number = request.POST.get('financial_number') phone_number = request.POST.get('phone_number') vat = request.POST.get('vat') + if vat == 'true': + vat = True + else: + vat = False commercial_registration = request.POST.get('commercial_registration') website = request.POST.get('website') business_type = request.POST.get('business_type') @@ -850,4 +893,97 @@ def save_tag(request): # Reload the parent page return HttpResponse('') - return redirect('tags') \ No newline at end of file + return redirect('tags') + + +# EDIT TEMPLATES + +@login_required +def edit_project(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-project.html', context) + + +@login_required +def edit_epic(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-epic.html', context) + + +@login_required +def edit_task(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-task.html', context) + + +@login_required +def edit_customer(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-customer.html', context) + + +@login_required +def edit_business(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-business.html', context) + + +@login_required +def edit_staff(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-staff.html', context) + + +@login_required +def edit_staff_position(request): + + context = { + + + } + return render(request, 'edit_pages/edit-staff-position.html', context) + + +@login_required +def edit_project_type(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-project-type.html', context) + + +@login_required +def edit_reference(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-reference.html', context) + + +@login_required +def edit_tag(request, *args, **kwargs): + + context = { + + } + return render(request, 'edit_pages/edit-tag.html', context) \ No newline at end of file diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc index 0851eb03..9b65f9a3 100644 Binary files a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc differ diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc index 1b9529f8..40877a56 100644 Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc differ diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index 2eaee623..47fde9d9 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/__pycache__/wsgi.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc index 7fd1b109..186b2e05 100644 Binary files a/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc differ diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py index 9917a483..7dc91c2e 100644 --- a/osinaweb/osinaweb/urls.py +++ b/osinaweb/osinaweb/urls.py @@ -37,6 +37,7 @@ urlpatterns = [ path('addstaff/', views.addstaff, name='adduser'), path('staffdetails/', views.staffdetails, name='userdetails'), path('staffs/', views.staffs, name='users'), + path('staffpositions/', views.staff_positions, name='staffpositions'), path('projectdetails//', views.detailed_project, name='detailed-project'), path('createproject/', views.create_project, name='createproject'), path('createepic//', views.create_epic, name='createepic'), @@ -47,6 +48,8 @@ urlpatterns = [ path('projecttypes/', views.project_types, name='projecttypes'), path('references/', views.references, name='references'), path('tags/', views.tags, name='tags'), + path('dailyreports/', views.daily_reports, name='dailyreports'), + path('adddailyreport/', views.add_daily_report, name='adddailyreport'), @@ -69,6 +72,7 @@ urlpatterns = [ path('addreference/', views.add_reference_modal, name='addreference'), path('addtag/', views.add_tag_modal, name='addtag'), path('addbusinesscustomer/', views.add_business_modal, name='addbusinesscustomer'), + path('addstaffposition/', views.staff_position_modal, name='addstaffposition'), # Save Urls @@ -84,6 +88,18 @@ urlpatterns = [ path('save_projecttype/', views.save_projecttype, name='save_projecttype'), path('save_reference/', views.save_reference, name='save_reference'), path('save_tag/', views.save_tag, name='save_tag'), + + # Edit Templates + path('editproject/', views.edit_project, name='editproject'), + path('editepic/', views.edit_epic, name='editepic'), + path('edittask/', views.edit_task, name='edittask'), + path('editcustomer/', views.edit_customer, name='editcustomer'), + path('editbusiness/', views.edit_business, name='editbusiness'), + path('editstaff/', views.edit_staff, name='editstaff'), + path('editprojecttype/', views.edit_project_type, name='editprojecttype'), + path('editreference/', views.edit_reference, name='editreference'), + path('edittag/', views.edit_tag, name='edittag'), + path('editstaffposition/', views.edit_staff_position, name='editstaffposition'), ] diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index f95c28a4..29a413fa 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -1138,10 +1138,6 @@ video { gap: 2.5%; } -.gap-\[3\%\] { - gap: 3%; -} - .gap-y-2 { row-gap: 0.5rem; } @@ -1464,6 +1460,10 @@ video { padding: 0.75rem; } +.p-4 { + padding: 1rem; +} + .p-5 { padding: 1.25rem; } diff --git a/osinaweb/static/images/C2ruP-K3_400x400_3eYEtuD.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_3eYEtuD.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_3eYEtuD.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_4AODM0o.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_4AODM0o.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_4AODM0o.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_BJgGtCP.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_BJgGtCP.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_BJgGtCP.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_DPUp266.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_DPUp266.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_DPUp266.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_I1E4CQj.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_I1E4CQj.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_I1E4CQj.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_IJJlte7.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_IJJlte7.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_IJJlte7.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_Q7eQAKS.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_Q7eQAKS.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_Q7eQAKS.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_TXX9jQR.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_TXX9jQR.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_TXX9jQR.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_U67xUdh.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_U67xUdh.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_U67xUdh.jpeg differ diff --git a/osinaweb/static/images/C2ruP-K3_400x400_jaNO7I2.jpeg b/osinaweb/static/images/C2ruP-K3_400x400_jaNO7I2.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400_jaNO7I2.jpeg differ diff --git a/osinaweb/static/images/images.jpeg b/osinaweb/static/images/images.jpeg new file mode 100644 index 00000000..8b8b6da9 Binary files /dev/null and b/osinaweb/static/images/images.jpeg differ diff --git a/osinaweb/static/images/images_66hc7wJ.jpeg b/osinaweb/static/images/images_66hc7wJ.jpeg new file mode 100644 index 00000000..8b8b6da9 Binary files /dev/null and b/osinaweb/static/images/images_66hc7wJ.jpeg differ diff --git a/osinaweb/static/images/images_8R30tKx.jpeg b/osinaweb/static/images/images_8R30tKx.jpeg new file mode 100644 index 00000000..8b8b6da9 Binary files /dev/null and b/osinaweb/static/images/images_8R30tKx.jpeg differ diff --git a/osinaweb/static/images/images_94RQy8u.jpeg b/osinaweb/static/images/images_94RQy8u.jpeg new file mode 100644 index 00000000..8b8b6da9 Binary files /dev/null and b/osinaweb/static/images/images_94RQy8u.jpeg differ diff --git a/osinaweb/static/images/images_dT85NkR.jpeg b/osinaweb/static/images/images_dT85NkR.jpeg new file mode 100644 index 00000000..8b8b6da9 Binary files /dev/null and b/osinaweb/static/images/images_dT85NkR.jpeg differ diff --git a/osinaweb/static/images/images_qObPEjJ.jpeg b/osinaweb/static/images/images_qObPEjJ.jpeg new file mode 100644 index 00000000..8b8b6da9 Binary files /dev/null and b/osinaweb/static/images/images_qObPEjJ.jpeg differ diff --git a/osinaweb/static/images/images_vB09pgG.jpeg b/osinaweb/static/images/images_vB09pgG.jpeg new file mode 100644 index 00000000..8b8b6da9 Binary files /dev/null and b/osinaweb/static/images/images_vB09pgG.jpeg differ diff --git a/osinaweb/static/images/images_yxpbY7h.jpeg b/osinaweb/static/images/images_yxpbY7h.jpeg new file mode 100644 index 00000000..8b8b6da9 Binary files /dev/null and b/osinaweb/static/images/images_yxpbY7h.jpeg differ diff --git a/osinaweb/static/js/epics.js b/osinaweb/static/js/epics.js index eeadc13a..03649492 100644 --- a/osinaweb/static/js/epics.js +++ b/osinaweb/static/js/epics.js @@ -1,6 +1,7 @@ const epicSelect = document.getElementById('epicSelect'); const epicDetails = document.getElementById('epicDetails'); const epicRelatedTasks = document.getElementById('epicRelatedTasks'); +const editEpicButton = document.getElementById('editEpicButton'); const createTaskButton = document.getElementById('createTaskButton'); const createStoryButton = document.getElementById('createStoryButton'); @@ -11,6 +12,10 @@ epicSelect.addEventListener('change', function () { epicRelatedTasks.classList.remove('hidden'); + editEpicButton.classList.remove('cursor-not-allowed', 'opacity-30'); + editEpicButton.classList.add('cursor-pointer'); + editEpicButton.removeAttribute('disabled'); + createTaskButton.classList.remove('cursor-not-allowed', 'opacity-30'); createTaskButton.classList.add('cursor-pointer'); createTaskButton.removeAttribute('disabled'); @@ -24,6 +29,9 @@ epicSelect.addEventListener('change', function () { epicRelatedTasks.classList.add('hidden'); + editEpicButton.classList.add('cursor-not-allowed', 'opacity-30'); + editEpicButton.setAttribute('disabled', true); + createTaskButton.classList.add('cursor-not-allowed', 'opacity-30'); createTaskButton.setAttribute('disabled', true); diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index a5e60f38..59e188e2 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/osinaweb/static/js/pop-modals.js @@ -57,6 +57,7 @@ document.addEventListener("DOMContentLoaded", function () { addButtonClickListener("addReferenceButton", "fit-content", "230px"); addButtonClickListener("addTagButton", "fit-content", "160px"); addButtonClickListener("addBusinessButton", "550px", "500px"); + addButtonClickListener("addStaffPositionButton", "fit-content", "160px"); const closeButton = document.getElementById("closeModalButton"); closeButton.addEventListener("click", () => { diff --git a/osinaweb/templates/add-business.html b/osinaweb/templates/add-business.html index 0c7b3970..6e48f5c3 100644 --- a/osinaweb/templates/add-business.html +++ b/osinaweb/templates/add-business.html @@ -7,6 +7,9 @@

Add Business

+ + +
{% csrf_token %} +
- +
- - +
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/add-staff.html b/osinaweb/templates/add-staff.html index 348b0d6f..04058c4c 100644 --- a/osinaweb/templates/add-staff.html +++ b/osinaweb/templates/add-staff.html @@ -18,12 +18,13 @@ {% csrf_token %}
- +
- + Upload Profile Picture
diff --git a/osinaweb/templates/add-staffposition-modal.html b/osinaweb/templates/add-staffposition-modal.html new file mode 100644 index 00000000..51425668 --- /dev/null +++ b/osinaweb/templates/add-staffposition-modal.html @@ -0,0 +1,32 @@ +{% load static %} + + + + + + + Osina + + + + + + + +
+ {% csrf_token %} +

Add Staff Position

+ +
+ +
+ +
+ +
+
+ + \ No newline at end of file diff --git a/osinaweb/templates/addfile-modal.html b/osinaweb/templates/addfile-modal.html index 31d42b89..2b85ab58 100644 --- a/osinaweb/templates/addfile-modal.html +++ b/osinaweb/templates/addfile-modal.html @@ -19,9 +19,9 @@

Add File

-
- --> +
+ + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-business.html b/osinaweb/templates/edit_pages/edit-business.html new file mode 100644 index 00000000..945570e0 --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-business.html @@ -0,0 +1,124 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Business +

+ + + {% csrf_token %} + + +
+
+ + Upload Business + Logo + + +
+
+ + + + + + + + +
+ + +
+ + + + + + + + + + + + + + +
+ +
+ + +
+
+
+ + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-customer.html b/osinaweb/templates/edit_pages/edit-customer.html new file mode 100644 index 00000000..6e163d3f --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-customer.html @@ -0,0 +1,124 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Customer +

+ +
+ {% csrf_token %} +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ +
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-epic.html b/osinaweb/templates/edit_pages/edit-epic.html new file mode 100644 index 00000000..76b668ba --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-epic.html @@ -0,0 +1,69 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Epic +

+ +
+ {% csrf_token %} + + + + + + + + + +
+ + +
+ +
+ + +
+ +
+ +
+
+
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-project-type.html b/osinaweb/templates/edit_pages/edit-project-type.html new file mode 100644 index 00000000..44052f51 --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-project-type.html @@ -0,0 +1,44 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Project Type +

+ +
+ {% csrf_token %} + +
+ +
+ +
+ +
+
+ +
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-project.html b/osinaweb/templates/edit_pages/edit-project.html new file mode 100644 index 00000000..edd2348d --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-project.html @@ -0,0 +1,152 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Project +

+ +
+ {% csrf_token %} + + + + + + + + + + + + + + +
+
+ +
+ + + + + +
+ + + +
+ + +
+ +
+ + +
+
+ +
+
+
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-reference.html b/osinaweb/templates/edit_pages/edit-reference.html new file mode 100644 index 00000000..40c53f3e --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-reference.html @@ -0,0 +1,48 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Reference +

+ +
+ {% csrf_token %} + +
+ + + +
+ +
+ +
+
+ +
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-staff-position.html b/osinaweb/templates/edit_pages/edit-staff-position.html new file mode 100644 index 00000000..c480f5d0 --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-staff-position.html @@ -0,0 +1,43 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Staff Position +

+ +
+ {% csrf_token %} +
+ +
+ +
+ +
+
+ +
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-staff.html b/osinaweb/templates/edit_pages/edit-staff.html new file mode 100644 index 00000000..e011fd9e --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-staff.html @@ -0,0 +1,139 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Staff +

+ +
+ {% csrf_token %} +
+
+ +
+ +
+
+ + Upload + Profile Picture + +
+
+ + + + + + + + + + + + + + + + +
+ +

Active

+
+ +
+ +

Intern

+
+ + + + + + +
+ +
+
+
+ +
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-tag.html b/osinaweb/templates/edit_pages/edit-tag.html new file mode 100644 index 00000000..9f8606fe --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-tag.html @@ -0,0 +1,44 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Tag +

+ +
+ {% csrf_token %} + +
+ +
+ +
+ +
+
+ +
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/edit_pages/edit-task.html b/osinaweb/templates/edit_pages/edit-task.html new file mode 100644 index 00000000..0020723f --- /dev/null +++ b/osinaweb/templates/edit_pages/edit-task.html @@ -0,0 +1,128 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Edit Task +

+ +
+ {% csrf_token %} + + + + + + + + + + + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + Upload + Document(s) + + +
+
+ + + + +
+ +
+
+
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/index.html b/osinaweb/templates/index.html index 6a5dc610..e02bd631 100644 --- a/osinaweb/templates/index.html +++ b/osinaweb/templates/index.html @@ -8,7 +8,8 @@

Recent Note:

-
+

{{recent_note.text}}

@@ -20,7 +21,8 @@ id="showNotesButton">Show Notes
@@ -118,7 +120,8 @@

Assigned To:

-

{{task.assigned_to.first_name}} {{task.assigned_to.last_name}}

+

{{task.assigned_to.first_name}} + {{task.assigned_to.last_name}}

@@ -142,26 +145,35 @@ - + class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-red-500 text-white deleteTaskButton" + data-modal-url="{% url 'deletetask' %}">Delete + + + + class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500 rounded-br-md timelineButton" + data-modal-url="{% url 'timeline' %}">Timeline
@@ -187,7 +199,8 @@ class="w-full h-full object-cover rounded-full">
-

{{latest.staff.first_name}} {{latest.staff.last_name}}

+

{{latest.staff.first_name}} + {{latest.staff.last_name}}

{{latest.time}}

diff --git a/osinaweb/templates/main.html b/osinaweb/templates/main.html index e4e879f0..2de178f6 100644 --- a/osinaweb/templates/main.html +++ b/osinaweb/templates/main.html @@ -14,7 +14,8 @@
-
+
@@ -31,51 +32,6 @@ Home
- -
-
-
- -

Utilities

-
-
- - -
-
- - -
-
@@ -171,6 +133,58 @@
+ +
+
+
+ +

Utilities

+
+
+ + +
+
+ + +
+

Activity

@@ -183,7 +197,8 @@
-
+

Powered By Ositcom

Copyrights © 2023 All Rights Reserved

@@ -209,7 +224,8 @@ class="text-slate-700 font-semibold">{{last_status.text}}

@@ -218,7 +234,8 @@
-

{{request.user.staffprofile.first_name}} {{request.user.staffprofile.last_name}}

+

{{request.user.staffprofile.first_name}} + {{request.user.staffprofile.last_name}}

diff --git a/osinaweb/templates/project-details.html b/osinaweb/templates/project-details.html index d103fe56..f9bf37f9 100644 --- a/osinaweb/templates/project-details.html +++ b/osinaweb/templates/project-details.html @@ -111,9 +111,11 @@ - + + +
@@ -236,7 +238,8 @@ {%endfor%}
- +
@@ -279,7 +282,9 @@
-
@@ -320,8 +325,8 @@
-
- diff --git a/osinaweb/templates/project-types.html b/osinaweb/templates/project-types.html index fbbd8df9..3ef18f52 100644 --- a/osinaweb/templates/project-types.html +++ b/osinaweb/templates/project-types.html @@ -99,9 +99,11 @@

{{type.name}}

-
- -
+ +
+ +
+
diff --git a/osinaweb/templates/projects.html b/osinaweb/templates/projects.html index 574ed77d..e4396ec7 100644 --- a/osinaweb/templates/projects.html +++ b/osinaweb/templates/projects.html @@ -66,7 +66,8 @@
-
@@ -106,12 +107,6 @@

Status

-

Action

@@ -160,9 +155,11 @@ -
- -
+ +
+ +
+
@@ -193,7 +190,8 @@ class="w-full h-full object-cover rounded-full">
-

{{latest.staff.first_name}} {{latest.staff.last_name}}

+

{{latest.staff.first_name}} + {{latest.staff.last_name}}

{{latest.time}}

diff --git a/osinaweb/templates/references.html b/osinaweb/templates/references.html index c7370d99..48989bcc 100644 --- a/osinaweb/templates/references.html +++ b/osinaweb/templates/references.html @@ -105,9 +105,11 @@

{{reference.formatted_date}}

-
- -
+ +
+ +
+
diff --git a/osinaweb/templates/staff-details.html b/osinaweb/templates/staff-details.html index 95d8dba8..c62213ad 100644 --- a/osinaweb/templates/staff-details.html +++ b/osinaweb/templates/staff-details.html @@ -69,9 +69,11 @@ - + + +
diff --git a/osinaweb/templates/staff-positions.html b/osinaweb/templates/staff-positions.html new file mode 100644 index 00000000..0b6b3ffa --- /dev/null +++ b/osinaweb/templates/staff-positions.html @@ -0,0 +1,196 @@ +{% extends "main.html" %} +{%load static%} +{% block title %}My Projects{% endblock %} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

+
+
+ + +
+
+ + + +
+
+ + +
+ +
+
+

Staff Positions

+ + +
+
+
+ + +
+
+
+ +
+
+ +
+
+ +
+
+

Position

+
+
+ Actions +
+
+ + +
+ + +
+
+

Developer

+
+
+ +
+ +
+ + +
+ +
+ +
+ +
+
+
+
+
+
+
+
+ + +
+

USERS ACTIVITY

+
+ + + {% for latest in latest_statuses %} + +
+
+
+
+
+ user profile +
+
+

{{latest.staff.first_name}} + {{latest.staff.last_name}}

+

{{latest.time}}

+
+
+
+ +
+
+ + +
+

{{latest.text}}

+
+ + +
+ + +
+
+
+ {% endfor %} + + +
+
+
+ +
+ + + + + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/staffs.html b/osinaweb/templates/staffs.html index 7303f6af..99eab421 100644 --- a/osinaweb/templates/staffs.html +++ b/osinaweb/templates/staffs.html @@ -122,9 +122,11 @@ -
- -
+ +
+ +
+
diff --git a/osinaweb/templates/tags.html b/osinaweb/templates/tags.html index 87d110b0..a0d55613 100644 --- a/osinaweb/templates/tags.html +++ b/osinaweb/templates/tags.html @@ -99,9 +99,11 @@

{{tag.name}}

-
- -
+ +
+ +
+
diff --git a/osinaweb/templates/task-details.html b/osinaweb/templates/task-details.html index eef1439c..047c5446 100644 --- a/osinaweb/templates/task-details.html +++ b/osinaweb/templates/task-details.html @@ -64,9 +64,11 @@ + +
@@ -113,27 +115,6 @@

Points:

-
@@ -175,6 +156,11 @@
+ +
+ + +
@@ -287,6 +273,9 @@
+
+ +