diff --git a/courses/migrations/0020_auto_20220224_2057.py b/courses/migrations/0020_auto_20220224_2057.py new file mode 100644 index 0000000..2921862 --- /dev/null +++ b/courses/migrations/0020_auto_20220224_2057.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.5 on 2022-02-24 15:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0019_auto_20220222_2142'), + ] + + operations = [ + migrations.AlterField( + model_name='article', + name='home_page_display', + field=models.CharField(blank=True, choices=[('Featured', 'Featured'), ('Exclusive', 'Exclusive')], max_length=20, null=True), + ), + migrations.AlterField( + model_name='article', + name='status', + field=models.CharField(choices=[('Published', 'Published'), ('Draft', 'Draft'), ('Created', 'Created'), ('Rejected', 'Rejected')], default='Draft', max_length=20), + ), + ] diff --git a/courses/migrations/0021_auto_20220224_2105.py b/courses/migrations/0021_auto_20220224_2105.py new file mode 100644 index 0000000..0bcae10 --- /dev/null +++ b/courses/migrations/0021_auto_20220224_2105.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.5 on 2022-02-24 15:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0020_auto_20220224_2057'), + ] + + operations = [ + migrations.AlterField( + model_name='article', + name='home_page_display', + field=models.CharField(blank=True, choices=[('Exclusive', 'Exclusive'), ('Featured', 'Featured')], max_length=20, null=True), + ), + migrations.AlterField( + model_name='article', + name='status', + field=models.CharField(choices=[('Rejected', 'Rejected'), ('Draft', 'Draft'), ('Created', 'Created'), ('Published', 'Published')], default='Draft', max_length=20), + ), + ] diff --git a/events/migrations/0003_auto_20220224_2057.py b/events/migrations/0003_auto_20220224_2057.py new file mode 100644 index 0000000..f23865e --- /dev/null +++ b/events/migrations/0003_auto_20220224_2057.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.5 on 2022-02-24 15:27 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0006_auto_20220222_2142'), + ('events', '0002_event_domain_of_event'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='event_lead', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='members.member'), + ), + migrations.AddField( + model_name='event', + name='organisers', + field=models.ManyToManyField(blank=True, related_name='Organising_Members', to='members.Member'), + ), + ] diff --git a/events/models.py b/events/models.py index 0739e6c..f8b3036 100644 --- a/events/models.py +++ b/events/models.py @@ -1,7 +1,7 @@ from django.db import models from django.contrib.auth.models import User from django.template.defaultfilters import slugify - +from members.models import Member # Create your models here. GENDER_CHOICES = [ @@ -29,7 +29,8 @@ class Event(models.Model): registration_start_date = models.DateField(null=True, blank=True) registration_end_date = models.DateField(null=True, blank=True) domain_of_event=models.ManyToManyField('courses.Domain',related_name='Domain_of_Events',blank=True) - + event_lead=models.ForeignKey(Member,on_delete=models.SET_NULL, null=True,blank=True) + organisers=models.ManyToManyField(Member,related_name='Organising_Members',blank=True) def __str__(self): return self.name diff --git a/projects/migrations/0009_auto_20220224_2057.py b/projects/migrations/0009_auto_20220224_2057.py new file mode 100644 index 0000000..0229662 --- /dev/null +++ b/projects/migrations/0009_auto_20220224_2057.py @@ -0,0 +1,34 @@ +# Generated by Django 3.2.5 on 2022-02-24 15:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0006_auto_20220222_2142'), + ('projects', '0008_project_domain_of_project'), + ] + + operations = [ + migrations.AddField( + model_name='project', + name='contributor', + field=models.ManyToManyField(blank=True, related_name='Project_contributors', to='members.Member'), + ), + migrations.AddField( + model_name='project', + name='documents_of_project', + field=models.ManyToManyField(blank=True, related_name='Project_related_docs', to='projects.Document'), + ), + migrations.AddField( + model_name='project', + name='is_Team', + field=models.BooleanField(blank=True, default=True), + ), + migrations.AddField( + model_name='project', + name='project_status', + field=models.CharField(choices=[('Ongoing', 'Ongoing'), ('Completed', 'Completed'), ('Stopped', 'Stopped')], default='Ongoing', max_length=20, null=True), + ), + ] diff --git a/projects/migrations/0010_auto_20220224_2105.py b/projects/migrations/0010_auto_20220224_2105.py new file mode 100644 index 0000000..ad2bd9c --- /dev/null +++ b/projects/migrations/0010_auto_20220224_2105.py @@ -0,0 +1,24 @@ +# Generated by Django 3.2.5 on 2022-02-24 15:35 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0021_auto_20220224_2105'), + ('projects', '0009_auto_20220224_2057'), + ] + + operations = [ + migrations.RemoveField( + model_name='project', + name='domain_of_project', + ), + migrations.AddField( + model_name='project', + name='domain_of_project', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Domain_of_Projects', to='courses.domain'), + ), + ] diff --git a/projects/models.py b/projects/models.py index b9af188..2830bed 100644 --- a/projects/models.py +++ b/projects/models.py @@ -8,6 +8,11 @@ import datetime from django.contrib.auth.models import User # Create your models here. +PROJECT_STATUS=[ + ('Ongoing','Ongoing'), + ('Completed','Completed'), + ('Stopped','Stopped') +] class Project(models.Model): name = models.CharField(max_length=100) @@ -20,13 +25,17 @@ class Project(models.Model): start_date = models.DateField(default=timezone.now) end_date = models.DateField(null=True, blank=True) members = models.ManyToManyField(Member) - domain_of_project=models.ManyToManyField('courses.Domain',related_name='Domain_of_Projects',blank=True) + domain_of_project=models.ForeignKey('courses.Domain',on_delete=models.CASCADE,related_name='Domain_of_Projects',null=True,blank=True) + documents_of_project=models.ManyToManyField('Document',related_name='Project_related_docs',blank=True) tech_stack = ListCharField( base_field=models.CharField(max_length=40), size=20, null=True, max_length=(21 * 50) # 6 * 10 character nominals, plus commas ) + is_Team = models.BooleanField(default=True, blank=True) + contributor=models.ManyToManyField(Member,related_name='Project_contributors',blank=True) + project_status=models.CharField(choices=PROJECT_STATUS,max_length=20,null=True,default='Ongoing') def __str__(self): return self.name