diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index a6d767d6..dab4e0b1 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc b/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc index f6344315..f8ba56ad 100644 Binary files a/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc index ba64e83f..dc91d65b 100644 Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc b/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc index 1bc6bab2..5ff40cf5 100644 Binary files a/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc index e091a245..dfcbe0e1 100644 Binary files a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc b/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc index a4a9f5e6..57600999 100644 Binary files a/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc index b32e5975..7147d30d 100644 Binary files a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc index 623efe6d..fd876d2d 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/forms.py b/osinaweb/osinacore/forms.py index a10612dc..1f8a0109 100644 --- a/osinaweb/osinacore/forms.py +++ b/osinaweb/osinacore/forms.py @@ -1,19 +1,11 @@ +from django.contrib.auth.forms import UserCreationForm from django import forms +from django.contrib.auth.models import User from .models import * + class CustomLoginForm(forms.Form): username = forms.CharField(label='Username', max_length=150) password = forms.CharField(label='Password', widget=forms.PasswordInput) - -class SignUpForm(forms.ModelForm): - class Meta: - model = CustomerProfile - fields = ['first_name', 'last_name', 'email', 'password', 'mobile_number', 'status', 'reference', 'personal_website', 'business'] - - -class StaffSignUpForm(forms.ModelForm): - class Meta: - model = StaffProfile - fields = ['first_name', 'last_name', 'image', 'email', 'mobile_number', 'password', 'staff_position', 'intern', 'active'] \ No newline at end of file diff --git a/osinaweb/osinacore/migrations/0042_remove_customerprofile_email_and_more.py b/osinaweb/osinacore/migrations/0042_remove_customerprofile_email_and_more.py new file mode 100644 index 00000000..994ab1c4 --- /dev/null +++ b/osinaweb/osinacore/migrations/0042_remove_customerprofile_email_and_more.py @@ -0,0 +1,45 @@ +# Generated by Django 4.2.5 on 2024-01-03 13:02 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('osinacore', '0041_dailyreport'), + ] + + operations = [ + migrations.RemoveField( + model_name='customerprofile', + name='email', + ), + migrations.RemoveField( + model_name='customerprofile', + name='first_name', + ), + migrations.RemoveField( + model_name='customerprofile', + name='last_name', + ), + migrations.RemoveField( + model_name='customerprofile', + name='password', + ), + migrations.RemoveField( + model_name='staffprofile', + name='email', + ), + migrations.RemoveField( + model_name='staffprofile', + name='first_name', + ), + migrations.RemoveField( + model_name='staffprofile', + name='last_name', + ), + migrations.RemoveField( + model_name='staffprofile', + name='password', + ), + ] diff --git a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc index a0a41c0a..55f574f1 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc index 5a5ef6ce..a96b7557 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc index bd4e95c8..3542c465 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc index f31a83b5..bd944215 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc index 973f7be5..cad387f1 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc index 33af0531..8bcb94d4 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc index f3e2d699..e45bc000 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc index 62066cad..0dddbd71 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc index 26b9ff96..2aef7e18 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc index f948eaad..ebf5f4fe 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc index 66cf8a34..91a848ee 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc index bcd841c9..4ee5f941 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc index b587e4c0..fb187961 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc index 0df4ee72..ec9955ea 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc index 9096ef5e..657deb43 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc index 6eaee858..f78ec311 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc index 9096da76..83d0a4f7 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc index 25b74452..774a05b4 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc index 0b21cfe2..e640aed3 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc index d145d613..be04d5ae 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc index a5a5b850..ed7657b5 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc index 54871730..ca805159 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc index 65e492cd..801af241 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc index d785efcc..a2db294d 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc index a4d16c85..7e45c45c 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc index a32ec842..a4fa82c0 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc index 74b97d90..20e9ecf3 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc index 456637b4..6fd8b1d4 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc index 2daf3ddd..127ff125 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc index 2010a3b4..00e7fda0 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc index d76a61c8..443f94de 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc index bb374ac7..0bd6b120 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc index 903bfd65..dea58dc4 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc index 0772d671..c67d0653 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc index 1dbcfc37..d640de2e 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc index e38ed1e3..c9035ea5 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc index 7bf632e8..9f43e29e 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc index b332cbac..cb63ce7a 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc index abc9c4bc..6c4580b5 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc index fa75ee10..40707886 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc index f7d137ee..ae8d55b0 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc new file mode 100644 index 00000000..fe70fd1e Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc index 1040bc3c..7a3087b0 100644 Binary files a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py index 17ad6a36..79e8cf59 100644 --- a/osinaweb/osinacore/models.py +++ b/osinaweb/osinacore/models.py @@ -62,11 +62,7 @@ class Business(models.Model): class CustomerProfile(models.Model): user = models.OneToOneField(User, on_delete=models.CASCADE, blank=True) - first_name = models.CharField(max_length=50, blank=True) - last_name = models.CharField(max_length=50, blank=True) - email = models.EmailField(unique=True,blank=True) mobile_number = models.CharField(max_length=50, blank=True) - password = models.CharField(max_length=128, blank=True) personal_website = models.URLField(null=True, blank=True) STATUS_CHOICES = ( ('Active', 'Active'), @@ -102,13 +98,9 @@ class StaffPosition(models.Model): class StaffProfile(models.Model): user = models.OneToOneField(User, on_delete=models.CASCADE) - first_name = models.CharField(max_length=50) - last_name = models.CharField(max_length=50) image = models.ImageField(null=True, blank=True) - email = models.EmailField(unique=True) mobile_number = models.CharField(max_length=50) staff_position = models.ForeignKey(StaffPosition, on_delete=models.CASCADE, null=True, blank=True) - password = models.CharField(max_length=128) intern = models.BooleanField(default=False) active = models.BooleanField(default=True) staff_id = models.CharField(max_length=20, null=True, blank=True) # Allow null and blank for initial creation diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index beeee3b2..b33b4b1b 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -60,23 +60,19 @@ def home(request, *args, **kwargs): # Non-superadmin user can only see their assigned tasks tasks = Task.objects.filter(Q(assigned_to=request.user.staffprofile) & (Q(status='Open') | Q(status='Working On'))).order_by('-id') - # Initialize last_note_color with a default color - last_note_color = 'black' - - # Fetch the color of the last recent note - if recent_note: - last_note_color = recent_note.color context = { 'notes': notes, 'recent_note': recent_note, 'tasks': tasks, - 'last_note_color': last_note_color, - } return render(request, 'index.html', context) + + + + #Listing Pages @login_required def my_projects(request, *args, **kwargs): @@ -204,6 +200,12 @@ def staff_positions(request): return render(request, 'listing_pages/staff-positions.html', context) + + + + + + #Details pages @login_required def detailed_project(request, project_id): @@ -270,6 +272,10 @@ def detailed_task(request, task_id): return render(request, 'details_pages/task-details.html', context) + + + + #Add Pages @login_required def createtask_project(request, project_id): @@ -288,9 +294,9 @@ def createtask_project(request, project_id): @login_required def create_project(request): - staffs = StaffProfile.objects.all().order_by('-first_name') + staffs = StaffProfile.objects.all().order_by('-id') project_types = ProjectType.objects.all() - customers = CustomerProfile.objects.all().order_by('-first_name') + customers = CustomerProfile.objects.all().order_by('-id') context = { 'staffs' : staffs, 'project_types' : project_types, @@ -382,7 +388,6 @@ def add_daily_report(request): # Modals views - def add_note_modal(request, *args, **kwargs): context = { @@ -504,7 +509,6 @@ def staff_position_modal(request): #Fetch Views - def fetch_related_tasks(request): # Get the selected epic ID from the request epic_id = request.GET.get("epic_id") @@ -530,9 +534,9 @@ def fetch_related_tasks(request): -#Save Functions +#Save Functions @login_required def save_note(request): if request.method == 'POST': @@ -615,8 +619,6 @@ def save_epic(request): try: project = Project.objects.get(id=project_id) except Project.DoesNotExist: - # Handle the case where the project with the provided ID doesn't exist - # You might want to display an error message or redirect to an appropriate page. pass start_date = request.POST.get('start_date') @@ -708,7 +710,6 @@ 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 @@ -765,12 +766,12 @@ def save_business_modal(request): ) business.save() - # Fetch the updated options for the - +
diff --git a/osinaweb/templates/add_pages/add-staff.html b/osinaweb/templates/add_pages/add-staff.html index 383826af..54ff4d32 100644 --- a/osinaweb/templates/add_pages/add-staff.html +++ b/osinaweb/templates/add_pages/add-staff.html @@ -120,7 +120,10 @@ - + +
diff --git a/osinaweb/templates/add_pages/create-project.html b/osinaweb/templates/add_pages/create-project.html index 9c9af77b..d95a091d 100644 --- a/osinaweb/templates/add_pages/create-project.html +++ b/osinaweb/templates/add_pages/create-project.html @@ -26,7 +26,7 @@ class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500"> {% for staff in staffs %} - + {% endfor %} @@ -35,7 +35,7 @@ multiple> {% for staff in staffs %} - + {% endfor %} diff --git a/osinaweb/templates/details_pages/business-details.html b/osinaweb/templates/details_pages/business-details.html index d0a2b814..e9071b99 100644 --- a/osinaweb/templates/details_pages/business-details.html +++ b/osinaweb/templates/details_pages/business-details.html @@ -128,46 +128,10 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
- - -
- - -
-
-
- {% endfor %} +
+ + {% include 'recent-activities.html' %} +
diff --git a/osinaweb/templates/details_pages/customer-details.html b/osinaweb/templates/details_pages/customer-details.html index 4ffb256c..f02dddc3 100644 --- a/osinaweb/templates/details_pages/customer-details.html +++ b/osinaweb/templates/details_pages/customer-details.html @@ -206,46 +206,10 @@

USERS ACTIVITY

-
+
+ {% include 'recent-activities.html' %} - {% for latest in latest_statuses %} - -
-
-
-
-
- user profile -
-
-

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
- - -
- - -
-
-
- {% endfor %}
diff --git a/osinaweb/templates/details_pages/project-details.html b/osinaweb/templates/details_pages/project-details.html index e49c8319..1f56fe68 100644 --- a/osinaweb/templates/details_pages/project-details.html +++ b/osinaweb/templates/details_pages/project-details.html @@ -527,45 +527,10 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
+
- -
-

{{latest.text}}

-
+ {% include 'recent-activities.html' %} - -
- - -
-
-
- {% endfor %}
diff --git a/osinaweb/templates/details_pages/staff-details.html b/osinaweb/templates/details_pages/staff-details.html index 2b61df9b..f9263c15 100644 --- a/osinaweb/templates/details_pages/staff-details.html +++ b/osinaweb/templates/details_pages/staff-details.html @@ -120,112 +120,9 @@

USERS ACTIVITY

-
+
- -
-
-
-
-
- user profile -
-
-

Nataly

-

11:30 AM

-
-
-
- -
-
- - -
-

Closed - Create the Osina home page

-
- - -
- - -
-
-
- - -
-
-
-
-
- user profile -
-
-

Salim

-

11:30 AM

-
-
-
- -
-
- - -
-

Closed - Create the Osina home page

-
- - -
- - -
-
-
- - -
-
-
-
-
- user profile -
-
-

Emile

-

11:30 AM

-
-
-
- -
-
- - -
-

Closed - Create the Osina home page

-
- - -
- - -
-
-
+ {% include 'recent-activities.html' %}
diff --git a/osinaweb/templates/details_pages/task-details.html b/osinaweb/templates/details_pages/task-details.html index 9b534885..d9c0cead 100644 --- a/osinaweb/templates/details_pages/task-details.html +++ b/osinaweb/templates/details_pages/task-details.html @@ -354,45 +354,10 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
- - -
- - -
-
-
- {% endfor %} +
+ + {% include 'recent-activities.html' %} +
diff --git a/osinaweb/templates/listing_pages/businesses.html b/osinaweb/templates/listing_pages/businesses.html index b0d2d586..964a230f 100644 --- a/osinaweb/templates/listing_pages/businesses.html +++ b/osinaweb/templates/listing_pages/businesses.html @@ -140,45 +140,9 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
+
- -
-

{{latest.text}}

-
- - -
- - -
-
-
- {% endfor %} + {% include 'recent-activities.html' %}
diff --git a/osinaweb/templates/listing_pages/customers.html b/osinaweb/templates/listing_pages/customers.html index 4b909ae1..23d2b28f 100644 --- a/osinaweb/templates/listing_pages/customers.html +++ b/osinaweb/templates/listing_pages/customers.html @@ -111,10 +111,10 @@
-

{{customer.first_name}}

+

{{customer.user.first_name}}

-

{{customer.last_name}}

+

{{customer.user.last_name}}

{{customer.user.username}}

@@ -163,50 +163,13 @@
-

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
+
- -
-

{{latest.text}}

-
- - -
- - -
-
-
- {% endfor %} + {% include 'recent-activities.html' %} -
diff --git a/osinaweb/templates/listing_pages/daily-reports.html b/osinaweb/templates/listing_pages/daily-reports.html index 88a255e6..c99e0d47 100644 --- a/osinaweb/templates/listing_pages/daily-reports.html +++ b/osinaweb/templates/listing_pages/daily-reports.html @@ -118,47 +118,9 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
- - -
- - -
-
-
- {% endfor %} +
+ {% include 'recent-activities.html' %}
diff --git a/osinaweb/templates/listing_pages/project-types.html b/osinaweb/templates/listing_pages/project-types.html index 877af42b..c436c164 100644 --- a/osinaweb/templates/listing_pages/project-types.html +++ b/osinaweb/templates/listing_pages/project-types.html @@ -119,47 +119,10 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
+
- -
- - -
-
-
- {% endfor %} + {% include 'recent-activities.html' %} -
diff --git a/osinaweb/templates/listing_pages/projects.html b/osinaweb/templates/listing_pages/projects.html index e4396ec7..b2df1a25 100644 --- a/osinaweb/templates/listing_pages/projects.html +++ b/osinaweb/templates/listing_pages/projects.html @@ -176,46 +176,10 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
+
- -
-

{{latest.text}}

-
+ {% include 'recent-activities.html' %} - -
- - -
-
-
- {% endfor %}
diff --git a/osinaweb/templates/listing_pages/references.html b/osinaweb/templates/listing_pages/references.html index 91e70e51..591b17d2 100644 --- a/osinaweb/templates/listing_pages/references.html +++ b/osinaweb/templates/listing_pages/references.html @@ -125,47 +125,10 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
+
- -
- - -
-
-
- {% endfor %} + {% include 'recent-activities.html' %} -
diff --git a/osinaweb/templates/listing_pages/staff-positions.html b/osinaweb/templates/listing_pages/staff-positions.html index 3d691327..62996121 100644 --- a/osinaweb/templates/listing_pages/staff-positions.html +++ b/osinaweb/templates/listing_pages/staff-positions.html @@ -122,47 +122,9 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
- - -
- - -
-
-
- {% endfor %} +
+ {% include 'recent-activities.html' %}
diff --git a/osinaweb/templates/listing_pages/staffs.html b/osinaweb/templates/listing_pages/staffs.html index 2ff0234d..849f4d77 100644 --- a/osinaweb/templates/listing_pages/staffs.html +++ b/osinaweb/templates/listing_pages/staffs.html @@ -110,11 +110,11 @@
-

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

+

{{staff.user.first_name}} {{staff.user.last_name}}

-

{{staff.email}}

+

{{staff.user.email}}

@@ -142,47 +142,10 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
+
- -
- - -
-
-
- {% endfor %} + {% include 'recent-activities.html' %} -
diff --git a/osinaweb/templates/listing_pages/tags.html b/osinaweb/templates/listing_pages/tags.html index 10077c0d..62438c9a 100644 --- a/osinaweb/templates/listing_pages/tags.html +++ b/osinaweb/templates/listing_pages/tags.html @@ -119,46 +119,10 @@

USERS ACTIVITY

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

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

-

{{latest.time}}

-
-
-
- -
-
+
- -
-

{{latest.text}}

-
+ {% include 'recent-activities.html' %} - -
- - -
-
-
- {% endfor %} -
diff --git a/osinaweb/templates/listing_pages/tasks.html b/osinaweb/templates/listing_pages/tasks.html index fd1b6315..aafd8af1 100644 --- a/osinaweb/templates/listing_pages/tasks.html +++ b/osinaweb/templates/listing_pages/tasks.html @@ -222,45 +222,10 @@

USERS ACTIVITY

-
+
+ {% include 'recent-activities.html' %} - {% for latest in latest_statuses %} - -
-
-
-
-
- user profile -
-
-

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

-

{{latest.time}}

-
-
-
- -
-
- - -
-

{{latest.text}}

-
- - -
- - -
-
-
- {% endfor %}
diff --git a/osinaweb/templates/main.html b/osinaweb/templates/main.html index 98750a3e..42cfca11 100644 --- a/osinaweb/templates/main.html +++ b/osinaweb/templates/main.html @@ -238,19 +238,13 @@
- {% if user.is_superuser %} +
-

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

+

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

- {%else%} -
-

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

- -
- {% endif %} +
user-image
-

{{latest.status.staff.first_name}} - {{latest.status.staff.last_name}}

+

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

{% if latest.time_ago == '0min ago' %}

Just Now

{%else %}