Skip to content

migration files fixes #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ankitamk14 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

migration files fixes #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
009a730
migration files fixes
ankitamk14 Nov 4, 2022
48a3dd9
vle related model changes in invigilator
ankitamk14 Nov 4, 2022
33e3e06
vle changes from fk to many-to-many
ankitamk14 Nov 4, 2022
7344e04
vle invi changes
ankitamk14 Nov 4, 2022
68b56a0
added static files
ankitamk14 Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions csc/migrations/0017_auto_20221006_1045.py
View file
Open in desktop

This file was deleted.

46 changes: 28 additions & 18 deletions csc/migrations/0021_auto_20221103_1017.py → csc/migrations/0017_auto_20221104_1204.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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=[
Expand Down
18 changes: 0 additions & 18 deletions csc/migrations/0018_test_invigilator.py
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions csc/migrations/0019_auto_20221006_1214.py
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions csc/migrations/0020_auto_20221006_1632.py
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions csc/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,19 +200,15 @@ 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)
password_mail_sent = models.BooleanField(default=False)

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)
Expand Down
5 changes: 4 additions & 1 deletion csc/vle_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 16 additions & 0 deletions static/spoken/utility.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
16 changes: 16 additions & 0 deletions static/spoken/utility.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
});