From 818953e51ace59a613184706333250bdb3362f8c Mon Sep 17 00:00:00 2001 From: Logan Date: Thu, 15 Feb 2018 15:01:47 -0500 Subject: [PATCH 1/6] Basic Profile model made --- webapp/models/__init__.py | 1 + webapp/models/models.py | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 webapp/models/__init__.py create mode 100644 webapp/models/models.py diff --git a/webapp/models/__init__.py b/webapp/models/__init__.py new file mode 100644 index 0000000..c06c8a0 --- /dev/null +++ b/webapp/models/__init__.py @@ -0,0 +1 @@ +from models import Profile diff --git a/webapp/models/models.py b/webapp/models/models.py new file mode 100644 index 0000000..b51edf4 --- /dev/null +++ b/webapp/models/models.py @@ -0,0 +1,20 @@ +from django.db import models +from django.contrib.auth.models import User +from django.db.models.signals import post_save +from django.dispatch import receiver + +# Create your models here. + +class Profile(models.Model): + user = models.OneToOneField(User, on_delete=models.CASCADE) + email = models.TextField(max_length=100, blank=True) + password = models.CharField(max_length=32, blank=True) + +@receiver(post_save, sender=User) +def create_user_profile(sender, instance, created, **kwargs): + if created: + Profile.objects.create(user=instance) + +@receiver(post_save, sender=User) +def save_user_profile(sender, instance, **kwargs): + instance.profile.save() From 98b85b93cb229bdea3c308e9249e3026d566cb6c Mon Sep 17 00:00:00 2001 From: Logan Date: Thu, 15 Feb 2018 15:11:25 -0500 Subject: [PATCH 2/6] deleted models.py --- webapp/models.py | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 webapp/models.py diff --git a/webapp/models.py b/webapp/models.py deleted file mode 100644 index 71a8362..0000000 --- a/webapp/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. From dbd6e86086e51a9929bd8b92d2f2ae47b12685be Mon Sep 17 00:00:00 2001 From: Logan Date: Thu, 15 Feb 2018 15:20:06 -0500 Subject: [PATCH 3/6] Changed the models.py to profile.py --- webapp/models/profile.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 webapp/models/profile.py diff --git a/webapp/models/profile.py b/webapp/models/profile.py new file mode 100644 index 0000000..b51edf4 --- /dev/null +++ b/webapp/models/profile.py @@ -0,0 +1,20 @@ +from django.db import models +from django.contrib.auth.models import User +from django.db.models.signals import post_save +from django.dispatch import receiver + +# Create your models here. + +class Profile(models.Model): + user = models.OneToOneField(User, on_delete=models.CASCADE) + email = models.TextField(max_length=100, blank=True) + password = models.CharField(max_length=32, blank=True) + +@receiver(post_save, sender=User) +def create_user_profile(sender, instance, created, **kwargs): + if created: + Profile.objects.create(user=instance) + +@receiver(post_save, sender=User) +def save_user_profile(sender, instance, **kwargs): + instance.profile.save() From 06e01e3ca29f92457e0a08967a1bfe7482f0993c Mon Sep 17 00:00:00 2001 From: Logan Date: Thu, 15 Feb 2018 15:22:48 -0500 Subject: [PATCH 4/6] Get rid of the models.py. Replaced by profile.py --- webapp/models/models.py | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 webapp/models/models.py diff --git a/webapp/models/models.py b/webapp/models/models.py deleted file mode 100644 index b51edf4..0000000 --- a/webapp/models/models.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.db import models -from django.contrib.auth.models import User -from django.db.models.signals import post_save -from django.dispatch import receiver - -# Create your models here. - -class Profile(models.Model): - user = models.OneToOneField(User, on_delete=models.CASCADE) - email = models.TextField(max_length=100, blank=True) - password = models.CharField(max_length=32, blank=True) - -@receiver(post_save, sender=User) -def create_user_profile(sender, instance, created, **kwargs): - if created: - Profile.objects.create(user=instance) - -@receiver(post_save, sender=User) -def save_user_profile(sender, instance, **kwargs): - instance.profile.save() From 095f49a0205f3093a2bf77e50d83e73be073b6d6 Mon Sep 17 00:00:00 2001 From: Logan Date: Thu, 15 Feb 2018 18:25:44 -0500 Subject: [PATCH 5/6] Changed the from models to from .models --- webapp/models/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/models/__init__.py b/webapp/models/__init__.py index c06c8a0..7338011 100644 --- a/webapp/models/__init__.py +++ b/webapp/models/__init__.py @@ -1 +1 @@ -from models import Profile +from .models import Profile From 1c39f3f744969a5e6e72e07a413c96aeec6b10ec Mon Sep 17 00:00:00 2001 From: Logan Date: Thu, 22 Feb 2018 12:26:36 -0500 Subject: [PATCH 6/6] Furthest i could get --- webapp/models/profile.py | 25 +++++++++---------------- webapp/views.py | 3 --- webapp/views/__init__.py | 0 webapp/views/urls.py | 0 4 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 webapp/views.py create mode 100644 webapp/views/__init__.py create mode 100644 webapp/views/urls.py diff --git a/webapp/models/profile.py b/webapp/models/profile.py index b51edf4..112ddf0 100644 --- a/webapp/models/profile.py +++ b/webapp/models/profile.py @@ -1,20 +1,13 @@ +from django.contrib.auth.models import AbstractUser from django.db import models -from django.contrib.auth.models import User -from django.db.models.signals import post_save -from django.dispatch import receiver -# Create your models here. +class Profile(AbstractUser): + is_student = models.BooleanField(defualt=False) + is_companyrep = models.BoolenaField(default=False) +# is_admin = models.BooleanField(default=False) -class Profile(models.Model): - user = models.OneToOneField(User, on_delete=models.CASCADE) - email = models.TextField(max_length=100, blank=True) - password = models.CharField(max_length=32, blank=True) +class Student(models.Model): + user = models.OneToOneField(Profile, on_delete=models.CASCADE, primary_key=True) + resume = models.ManyToManyField(Resume, through='ResumeSubmitted') + cover_letter = models.ManyToManyField(Cover_Letter, through='CoverLetterSumbitted) -@receiver(post_save, sender=User) -def create_user_profile(sender, instance, created, **kwargs): - if created: - Profile.objects.create(user=instance) - -@receiver(post_save, sender=User) -def save_user_profile(sender, instance, **kwargs): - instance.profile.save() diff --git a/webapp/views.py b/webapp/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/webapp/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/webapp/views/__init__.py b/webapp/views/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/webapp/views/urls.py b/webapp/views/urls.py new file mode 100644 index 0000000..e69de29