diff --git a/csc/migrations/0017_auto_20221006_1045.py b/csc/migrations/0017_auto_20221006_1045.py deleted file mode 100644 index 962c17a..0000000 --- a/csc/migrations/0017_auto_20221006_1045.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.3 on 2022-10-06 05:15 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('csc', '0016_auto_20220930_1304'), - ] - - operations = [ - migrations.RemoveField( - model_name='test', - name='test_name', - ), - migrations.AddField( - model_name='test', - name='participant_count', - field=models.IntegerField(default=10), - preserve_default=False, - ), - migrations.AddField( - model_name='test', - name='status', - field=models.BooleanField(default=False), - ), - migrations.AlterField( - model_name='student', - name='date_of_registration', - field=models.DateField(default=datetime.date(2022, 10, 6)), - ), - migrations.AlterField( - model_name='test', - name='publish', - field=models.BooleanField(default=True), - ), - ] diff --git a/csc/migrations/0021_auto_20221103_1017.py b/csc/migrations/0017_auto_20221104_1204.py similarity index 81% rename from csc/migrations/0021_auto_20221103_1017.py rename to csc/migrations/0017_auto_20221104_1204.py index 340ef94..06bd6fd 100644 --- a/csc/migrations/0021_auto_20221103_1017.py +++ b/csc/migrations/0017_auto_20221104_1204.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.3 on 2022-11-03 04:47 +# Generated by Django 3.0.3 on 2022-11-04 06:34 import datetime from django.conf import settings @@ -10,10 +10,14 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('csc', '0020_auto_20221006_1632'), + ('csc', '0016_auto_20220930_1304'), ] operations = [ + migrations.RemoveField( + model_name='test', + name='test_name', + ), migrations.AddField( model_name='invigilator', name='password_mail_sent', @@ -24,6 +28,21 @@ class Migration(migrations.Migration): name='mdl_mail_sent', field=models.BooleanField(default=False), ), + migrations.AddField( + model_name='test', + name='invigilator', + field=models.ManyToManyField(blank=True, null=True, to='csc.Invigilator'), + ), + migrations.AddField( + model_name='test', + name='participant_count', + field=models.IntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='test', + name='status', + field=models.PositiveIntegerField(default=0), + ), migrations.AlterField( model_name='invigilator', name='phone', @@ -34,25 +53,20 @@ class Migration(migrations.Migration): name='user', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='invi', to=settings.AUTH_USER_MODEL), ), - migrations.AddField( - model_name='invigilator', - name='vle', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='invig', to='csc.VLE'), - preserve_default=False, - ), migrations.AlterField( model_name='student', name='date_of_registration', - field=models.DateField(default=datetime.date(2022, 11, 3)), + field=models.DateField(default=datetime.date(2022, 11, 4)), ), migrations.AlterField( model_name='test', - name='status', - field=models.PositiveIntegerField(default=0), + name='publish', + field=models.BooleanField(default=True), ), - migrations.AlterUniqueTogether( - name='invigilator', - unique_together={('user', 'vle')}, + migrations.AlterField( + model_name='test', + name='vle', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='csc.VLE'), ), migrations.CreateModel( name='CSCFossMdlCourses', @@ -68,10 +82,6 @@ class Migration(migrations.Migration): model_name='invigilator', name='added_by', ), - migrations.RemoveField( - model_name='invigilator', - name='vle', - ), migrations.CreateModel( name='CSCTestAtttendance', fields=[ diff --git a/csc/migrations/0018_test_invigilator.py b/csc/migrations/0018_test_invigilator.py deleted file mode 100644 index 1cec19d..0000000 --- a/csc/migrations/0018_test_invigilator.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2022-10-06 06:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('csc', '0017_auto_20221006_1045'), - ] - - operations = [ - migrations.AddField( - model_name='test', - name='invigilator', - field=models.ManyToManyField(blank=True, null=True, to='csc.Invigilator'), - ), - ] diff --git a/csc/migrations/0019_auto_20221006_1214.py b/csc/migrations/0019_auto_20221006_1214.py deleted file mode 100644 index d41d9d7..0000000 --- a/csc/migrations/0019_auto_20221006_1214.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2022-10-06 06:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('csc', '0018_test_invigilator'), - ] - - operations = [ - migrations.AlterField( - model_name='test', - name='participant_count', - field=models.IntegerField(blank=True, null=True), - ), - ] diff --git a/csc/migrations/0020_auto_20221006_1632.py b/csc/migrations/0020_auto_20221006_1632.py deleted file mode 100644 index e003884..0000000 --- a/csc/migrations/0020_auto_20221006_1632.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.0.3 on 2022-10-06 11:02 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('csc', '0019_auto_20221006_1214'), - ] - - operations = [ - migrations.AlterField( - model_name='test', - name='vle', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='csc.VLE'), - ), - ] diff --git a/csc/models.py b/csc/models.py index 47cb114..e145b21 100644 --- a/csc/models.py +++ b/csc/models.py @@ -200,9 +200,8 @@ def __str__(self): class Invigilator(models.Model): user = models.ForeignKey(User,on_delete=models.CASCADE,related_name='invi') phone = models.CharField(max_length=32,null=True,blank=True) - # vle = models.ManyToManyField(VLE) - # vle = models.ForeignKey(User,on_delete=models.CASCADE,related_name='invig') - vle = models.ForeignKey(VLE,on_delete=models.CASCADE,related_name='invig') + vle = models.ManyToManyField(VLE) + # vle = models.ForeignKey(VLE,on_delete=models.CASCADE,related_name='invig') # added_by = models.ForeignKey(User,on_delete=models.CASCADE,related_name='added_by_user') created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) @@ -210,9 +209,6 @@ class Invigilator(models.Model): def __str__(self): return f"{self.user.first_name} {self.user.last_name} - {self.user.email}" - - class Meta: - unique_together = [['user', 'vle']] class Test(models.Model): foss = models.ForeignKey(FossCategory,on_delete=models.CASCADE) diff --git a/csc/vle_views.py b/csc/vle_views.py index 682e4dd..f0f7cd3 100644 --- a/csc/vle_views.py +++ b/csc/vle_views.py @@ -782,7 +782,10 @@ def create_invigilator(request): user = User.objects.filter(email=email)[0] messages.add_message(request,messages.SUCCESS,f'User with this email {email} already exists & assigned to you as an Invigilator.') try: - Invigilator.objects.create(user=user,vle=vle,phone=phone) + # Invigilator.objects.create(user=user,vle=vle,phone=phone) + i=Invigilator.objects.create(user=user,phone=phone) + print(f"invi ************************************ {i}") + i.vle.add(vle) invi_group = Group.objects.get(name='INVIGILATOR') invi_group.user_set.add(user) if send_mail: diff --git a/static/spoken/utility.css b/static/spoken/utility.css new file mode 100644 index 0000000..75c46c2 --- /dev/null +++ b/static/spoken/utility.css @@ -0,0 +1,16 @@ +.form-group{ + margin-bottom: 12px; + margin-top: 12px; +} +label{ + font-weight: bold; +} +.fa-check-circle{ + color: green; +} +.fa-times-circle,.fa-trash-alt{ + color: maroon; +} +.fa-edit{ + color: midnightblue; +} \ No newline at end of file diff --git a/static/spoken/utility.js b/static/spoken/utility.js new file mode 100644 index 0000000..1a9eed7 --- /dev/null +++ b/static/spoken/utility.js @@ -0,0 +1,16 @@ + + $( ".student_check" ).click(function() { + alert( "Handler for .click() called." ); + }); + + + function myFunc(){ + alert('he') + onchange="this.form.submit()" + + } + + $('#select_test').on('change', function(){ + // alert('c'); + $(this).closest('form').submit(); +}); \ No newline at end of file