Skip to content

A
ARFA
Commit 5b5fec6b authored by NARRA SURAJ's avatar NARRA SURAJ
Browse files
Options

merge conflict resolved

parents d27dedf6 d67979c0
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 208 deletions
ARFA/ARFA_app/migrations/0001_initial.py
View file @ 5b5fec6b
# Generated by Django 2.1.3 on 2018-11-02 13:56
# Generated by Django 2.1.3 on 2018-11-03 11:28
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
......@@ -12,6 +13,73 @@ class Migration(migrations.Migration):
]
operations = [
migrations.CreateModel(
name='Contains',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('marks_pos', models.FloatField(null=True)),
('marks_neg', models.FloatField(null=True)),
],
),
migrations.CreateModel(
name='Created_BY',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
],
),
migrations.CreateModel(
name='Evaluvation',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('marks', models.FloatField(null=True)),
],
),
migrations.CreateModel(
name='Faculty',
fields=[
('name', models.CharField(max_length=200)),
('phone_number', models.CharField(max_length=10)),
('email_ID', models.CharField(max_length=200)),
('address', models.CharField(max_length=400)),
('username', models.CharField(max_length=200, primary_key=True, serialize=False)),
('password', models.CharField(max_length=200, validators=[django.core.validators.MinLengthValidator(4)])),
],
),
migrations.CreateModel(
name='Options',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('option_ID', models.IntegerField()),
('option_Value', models.CharField(max_length=1000)),
('is_Answer', models.BooleanField(default=False)),
],
),
migrations.CreateModel(
name='Question',
fields=[
('q_ID', models.AutoField(primary_key=True, serialize=False)),
('topic', models.CharField(max_length=20)),
('subtopic', models.CharField(max_length=20)),
('time_stamp', models.DateTimeField(auto_now=True)),
('source', models.CharField(max_length=200)),
('dificulty_set', models.CharField(max_length=20)),
('dificulty_observed', models.CharField(max_length=20)),
('question_text', models.CharField(max_length=1000)),
('image_link', models.CharField(max_length=200)),
('visibility', models.CharField(max_length=20)),
('ownership', models.CharField(max_length=20)),
('faculty', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Faculty')),
],
),
migrations.CreateModel(
name='Responses',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Response_value', models.BooleanField(default=False)),
('option_ID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Options')),
('q_ID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Question')),
],
),
migrations.CreateModel(
name='Student',
fields=[
......@@ -23,4 +91,117 @@ class Migration(migrations.Migration):
('password', models.CharField(max_length=200, validators=[django.core.validators.MinLengthValidator(4)])),
],
),
migrations.CreateModel(
name='Subject',
fields=[
('subject_ID', models.CharField(max_length=20, primary_key=True, serialize=False)),
('subject', models.CharField(max_length=20)),
],
),
migrations.CreateModel(
name='Takes',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('time_stamp', models.DateTimeField(auto_now=True)),
('total_marks', models.FloatField(null=True)),
('rank', models.IntegerField(default=0)),
('student', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Student')),
],
),
migrations.CreateModel(
name='Test',
fields=[
('test_ID', models.AutoField(primary_key=True, serialize=False)),
('test_name', models.CharField(max_length=200, unique=True)),
('visibility_student', models.CharField(max_length=20)),
('ownership', models.CharField(max_length=20)),
('expected_time_for_completion', models.DurationField(blank=True)),
('start_time', models.DateTimeField()),
('max_marks', models.FloatField(null=True)),
],
),
migrations.AddField(
model_name='takes',
name='test_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Test'),
),
migrations.AddField(
model_name='responses',
name='student_ID',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Student'),
),
migrations.AddField(
model_name='responses',
name='test_ID',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Test'),
),
migrations.AddField(
model_name='question',
name='subect_ID',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Subject'),
),
migrations.AddField(
model_name='options',
name='q_ID',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Question'),
),
migrations.AddField(
model_name='evaluvation',
name='q_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Question'),
),
migrations.AddField(
model_name='evaluvation',
name='student',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Student'),
),
migrations.AddField(
model_name='evaluvation',
name='test_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Test'),
),
migrations.AddField(
model_name='created_by',
name='faculty',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Faculty'),
),
migrations.AddField(
model_name='created_by',
name='test_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Test'),
),
migrations.AddField(
model_name='contains',
name='q_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Question'),
),
migrations.AddField(
model_name='contains',
name='test_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Test'),
),
migrations.AlterUniqueTogether(
name='takes',
unique_together={('student', 'test_ID')},
),
migrations.AlterUniqueTogether(
name='responses',
unique_together={('student_ID', 'test_ID', 'q_ID', 'option_ID')},
),
migrations.AlterUniqueTogether(
name='options',
unique_together={('q_ID', 'option_ID')},
),
migrations.AlterUniqueTogether(
name='evaluvation',
unique_together={('student', 'test_ID', 'q_ID')},
),
migrations.AlterUniqueTogether(
name='created_by',
unique_together={('faculty', 'test_ID')},
),
migrations.AlterUniqueTogether(
name='contains',
unique_together={('q_ID', 'test_ID')},
),
]
ARFA/ARFA_app/migrations/0002_faculty.py deleted 100644 → 0
View file @ d27dedf6
# Generated by Django 2.1.3 on 2018-11-02 13:57
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('ARFA_app', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Faculty',
fields=[
('name', models.CharField(max_length=200)),
('phone_number', models.CharField(max_length=10)),
('email_ID', models.CharField(max_length=200)),
('address', models.CharField(max_length=400)),
('username', models.CharField(max_length=200, primary_key=True, serialize=False)),
('password', models.CharField(max_length=200, validators=[django.core.validators.MinLengthValidator(4)])),
],
),
]
ARFA/ARFA_app/migrations/0003_auto_20181102_1638.py deleted 100644 → 0
View file @ d27dedf6
# -*- coding: utf-8 -*-
# Generated by Django 1.11.16 on 2018-11-02 16:38
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('ARFA_app', '0002_faculty'),
]
operations = [
migrations.CreateModel(
name='Contains',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('marks_pos', models.FloatField(null=True)),
('marks_neg', models.FloatField(null=True)),
],
),
migrations.CreateModel(
name='Created_BY',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('faculty', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Faculty')),
],
),
migrations.CreateModel(
name='Evaluvation',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('marks', models.FloatField(null=True)),
],
),
migrations.CreateModel(
name='Options',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('option_ID', models.IntegerField()),
('option_Value', models.CharField(max_length=1000)),
('is_Answer', models.BooleanField(default=False)),
],
),
migrations.CreateModel(
name='Question',
fields=[
('q_ID', models.AutoField(primary_key=True, serialize=False)),
('topic', models.CharField(max_length=20)),
('subtopic', models.CharField(max_length=20)),
('time_stamp', models.DateTimeField(auto_now=True)),
('source', models.CharField(max_length=200)),
('dificulty_set', models.CharField(max_length=20)),
('dificulty_observed', models.CharField(max_length=20)),
('qestion_text', models.CharField(max_length=1000)),
('image_link', models.CharField(max_length=200)),
('visibility', models.CharField(max_length=20)),
('ownership', models.CharField(max_length=20)),
('faculty', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Faculty')),
],
),
migrations.CreateModel(
name='Responses',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Response_value', models.BooleanField(default=False)),
('option_ID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Options')),
('q_ID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Question')),
('student_ID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Student')),
],
),
migrations.CreateModel(
name='Subject',
fields=[
('subect_ID', models.CharField(max_length=20, primary_key=True, serialize=False)),
('subject', models.CharField(max_length=20)),
],
),
migrations.CreateModel(
name='Takes',
fields=[
('test_ID', models.AutoField(primary_key=True, serialize=False)),
('time_stamp', models.DateTimeField(auto_now=True)),
('total_marks', models.FloatField(null=True)),
('student', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Student')),
],
),
migrations.CreateModel(
name='Test',
fields=[
('test_ID', models.AutoField(primary_key=True, serialize=False)),
('test_name', models.CharField(max_length=200, unique=True)),
('visibility_student', models.CharField(max_length=20)),
('ownership', models.CharField(max_length=20)),
('expected_time_for_completion', models.DurationField(blank=True)),
('start_time', models.DateTimeField()),
('max_marks', models.FloatField(null=True)),
],
),
migrations.AddField(
model_name='responses',
name='test_ID',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Test'),
),
migrations.AddField(
model_name='question',
name='subect_ID',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Subject'),
),
migrations.AddField(
model_name='options',
name='q_ID',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ARFA_app.Question'),
),
migrations.AddField(
model_name='evaluvation',
name='q_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Question'),
),
migrations.AddField(
model_name='evaluvation',
name='student',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Student'),
),
migrations.AddField(
model_name='evaluvation',
name='test_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Test'),
),
migrations.AddField(
model_name='created_by',
name='test_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Test'),
),
migrations.AddField(
model_name='contains',
name='q_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Question'),
),
migrations.AddField(
model_name='contains',
name='test_ID',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ARFA_app.Test'),
),
migrations.AlterUniqueTogether(
name='takes',
unique_together=set([('student', 'test_ID')]),
),
migrations.AlterUniqueTogether(
name='responses',
unique_together=set([('student_ID', 'test_ID', 'q_ID', 'option_ID')]),
),
migrations.AlterUniqueTogether(
name='options',
unique_together=set([('q_ID', 'option_ID')]),
),
migrations.AlterUniqueTogether(
name='evaluvation',
unique_together=set([('student', 'test_ID', 'q_ID')]),
),
migrations.AlterUniqueTogether(
name='created_by',
unique_together=set([('faculty', 'test_ID')]),
),
migrations.AlterUniqueTogether(
name='contains',
unique_together=set([('q_ID', 'test_ID')]),
),
]
ARFA/ARFA_app/models.py
View file @ 5b5fec6b
......@@ -35,7 +35,7 @@ class Test(models.Model):
max_marks = models.FloatField(null=True)
class Subject(models.Model):
subect_ID = models.CharField(max_length=20,primary_key=True)
subject_ID = models.CharField(max_length=20,primary_key=True)
subject = models.CharField(max_length=20)
class Responses(models.Model):
......@@ -90,10 +90,10 @@ class Question(models.Model):
class Takes(models.Model):
student = models.ForeignKey('Student',models.SET_NULL,blank=True,null=True)
test_ID = models.AutoField(primary_key=True)
test_ID = models.ForeignKey('Test',models.SET_NULL,blank=True,null=True)
time_stamp = models.DateTimeField(auto_now=True)
total_marks = models.FloatField(null=True)
rank = models.IntegerField
rank = models.IntegerField(default=0)
class Meta:
unique_together = (('student', 'test_ID'))
......
ARFA/ARFA_app/views.py
View file @ 5b5fec6b
......@@ -17,7 +17,9 @@ def profile(request):
if(not(authenticated["status"])):
return render(request,'ARFA_app/login.html',authenticated)
else:
return render(request,'ARFA_app/home.html',args)
request.session['username'] = args['user']
request.session['session'] = True
return render(request,'ARFA_app/home.html',args)
def check_auth(args):
tuple=models.Student.objects.filter(username=args["user"],password=args["password"])
......@@ -29,7 +31,9 @@ def check_auth(args):
def logout(request):
return render(request,'ARFA_app/logout.html')
print(request.session['username'])
request.session['session'] = False
return render(request,'ARFA_app/logout.html')
def testHome(request):
......@@ -69,4 +73,5 @@ def result(request):
return HttpResponse("Result page should be here")
\ No newline at end of file
return HttpResponse("Result page should be here")
models.py
View file @ 5b5fec6b
......@@ -27,15 +27,34 @@ class Faculty(models.Model):
class Test(models.Model):
test_ID = models.AutoField(primary_key=True)
test_name = models.CharField(max_length=200,uinque=True)
test_name = models.CharField(max_length=200,unique=True)
visibility_student = models.CharField(max_length=20)
ownership = models.CharField.CharField(max_length=20)
expected_time_for_completion = models.DateField(_(u"Conversation Date"),blank=True)
start_time = models.DateField(_(u"Conversation Date"),blank=True)
max_marks = models.DoubleField(null=True)
ownership = models.CharField(max_length=20)
expected_time_for_completion = models.DurationField(blank=True)
start_time = models.DateTimeField(auto_now=False, auto_now_add=False)
max_marks = models.FloatField(null=True)
class Subject(models.Model):
subect_ID = models.CharField(max_length=20,primary_key=True)
subject = models.CharField(max_length=20)
class Question(models.Model):
q_ID = models.AutoField(primary_key=True)
subect_ID = models.ForeignKey('Subject', on_delete=models.CASCADE)
faculty = models.ForeignKey('Faculty',models.SET_NULL,blank=True,null=True)
topic = models.CharField(max_length=20)
subtopic = models.CharField(max_length=20)
time_stamp = models.DateTimeField(auto_now=True)
source = models.CharField(max_length=200)
dificulty_set = models.CharField(max_length=20)
dificulty_observed = models.CharField(max_length=20)
qestion_text = models.CharField(max_length=1000)
image_link = models.CharField(max_length=200)
num_appeared = models.IntegerField
num_correct = models.IntegerField
visibility = models.CharField(max_length=20)
ownership = models.CharField(max_length=20)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment