diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index d82aeae6..b8043442 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc index d601880e..8e46df6a 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/migrations/0085_rename_date_staffposition_start_date_and_more.py b/osinaweb/osinacore/migrations/0085_rename_date_staffposition_start_date_and_more.py new file mode 100644 index 00000000..e141cae3 --- /dev/null +++ b/osinaweb/osinacore/migrations/0085_rename_date_staffposition_start_date_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.5 on 2024-06-24 09:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('osinacore', '0084_staffposition'), + ] + + operations = [ + migrations.RenameField( + model_name='staffposition', + old_name='date', + new_name='start_date', + ), + migrations.AddField( + model_name='staffposition', + name='end_date', + field=models.DateField(blank=True, null=True), + ), + ] diff --git a/osinaweb/osinacore/migrations/__pycache__/0085_rename_date_staffposition_start_date_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0085_rename_date_staffposition_start_date_and_more.cpython-310.pyc new file mode 100644 index 00000000..b9d56b76 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0085_rename_date_staffposition_start_date_and_more.cpython-310.pyc differ diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py index e21b96ac..669da195 100644 --- a/osinaweb/osinacore/models.py +++ b/osinaweb/osinacore/models.py @@ -129,7 +129,8 @@ class StaffProfile(models.Model): class StaffPosition(models.Model): staff = models.ForeignKey(StaffProfile, on_delete=models.CASCADE) position = models.ForeignKey(JobPosition, null=True, on_delete=models.SET_NULL) - date = models.DateField() + start_date = models.DateField() + end_date = models.DateField(null=True, blank=True) class ProjectType(models.Model): diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc index 125c6a23..9df999f7 100644 Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc differ diff --git a/osinaweb/osinaweb/settings.py b/osinaweb/osinaweb/settings.py index 81a49164..76480180 100644 --- a/osinaweb/osinaweb/settings.py +++ b/osinaweb/osinaweb/settings.py @@ -150,9 +150,9 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'static/images') DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -EMAIL_HOST = 'cloud121.osinode.com' +EMAIL_HOST = 'osinamail.ositcom.com' EMAIL_PORT = 587 -EMAIL_HOST_USER = 'osina@ositcom.net' -DEFAULT_FROM_EMAIL = 'osina@ositcom.net' -EMAIL_HOST_PASSWORD = 'EMILEselim!@67' +EMAIL_HOST_USER = 'osina@ositcom.com' +DEFAULT_FROM_EMAIL = 'osina@ositcom.com' +EMAIL_HOST_PASSWORD = 'ibiyes4700' EMAIL_USE_TLS = True