From 7f6977185ea7a591eee36c6f1ad00dc599bb5038 Mon Sep 17 00:00:00 2001 From: Chiamaka Date: Thu, 5 Oct 2023 23:40:11 +0200 Subject: [PATCH 1/2] Created model for academic experience --- cv_generator/main/admin.py | 3 ++- cv_generator/main/models.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/cv_generator/main/admin.py b/cv_generator/main/admin.py index a9eaabe..d377039 100644 --- a/cv_generator/main/admin.py +++ b/cv_generator/main/admin.py @@ -1,6 +1,7 @@ from django.contrib import admin -from .models import WorkingExperience, PersonalInformation +from .models import WorkingExperience, PersonalInformation, AcademicExperience # Register your models here. admin.site.register(WorkingExperience) admin.site.register(PersonalInformation) +admin.site.register(AcademicExperience) diff --git a/cv_generator/main/models.py b/cv_generator/main/models.py index 5e0c13d..331488e 100644 --- a/cv_generator/main/models.py +++ b/cv_generator/main/models.py @@ -23,7 +23,7 @@ def __str__(self): class PersonalInformation(models.Model): name = models.CharField(max_length=25, blank=False) - user = models.ForeignKey(User, on_delete=models.CASCADE) + user = models.ForeignKey(User, on_delete=models.CASCADE, default=None) email = models.EmailField(max_length=255, blank=False) website_links = models.URLField(blank=True) profile_photo = models.ImageField(upload_to="images/", blank=False) @@ -33,4 +33,16 @@ class PersonalInformation(models.Model): city = models.CharField(max_length=50, blank=False) def __str__(self): - return f'{self.name} | {self.email}' \ No newline at end of file + return f'{self.name} | {self.email}' + +class AcademicExperience(models.Model): + user = models.ForeignKey(User, on_delete=models.CASCADE) + institution = models.CharField(max_length=255, blank=False) + course = models.CharField(max_length=255, blank=False) + degree = models.CharField(max_length=255, blank=False) + summary = models.TextField(blank=False) + location = models.CharField(max_length=255, blank=False) + date_achieved = models.DateField(blank=False) + + def __str__(self): + return f'{self.degree}, {self.course} - {self.location}' From 4cc271a1c34eda9ff6babd3390bba7d0124eb18c Mon Sep 17 00:00:00 2001 From: Chiamaka Date: Sat, 7 Oct 2023 17:46:26 +0200 Subject: [PATCH 2/2] Minor adjustments in academic background --- cv_generator/main/models.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cv_generator/main/models.py b/cv_generator/main/models.py index 331488e..1dddd5e 100644 --- a/cv_generator/main/models.py +++ b/cv_generator/main/models.py @@ -40,9 +40,11 @@ class AcademicExperience(models.Model): institution = models.CharField(max_length=255, blank=False) course = models.CharField(max_length=255, blank=False) degree = models.CharField(max_length=255, blank=False) + score = models.FloatField(blank=True) summary = models.TextField(blank=False) location = models.CharField(max_length=255, blank=False) - date_achieved = models.DateField(blank=False) + start_date = models.DateField(blank=False) + date_completed = models.DateField(blank=True) def __str__(self): return f'{self.degree}, {self.course} - {self.location}'