summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xnccps2018/config.py2
-rw-r--r--website/migrations/0004_auto_20181004_1022.py45
-rw-r--r--website/migrations/0004_auto_20181012_0951.py (renamed from website/migrations/0004_auto_20181010_0942.py)2
-rw-r--r--website/migrations/0005_auto_20181005_0408.py23
-rw-r--r--website/migrations/0006_auto_20181005_0412.py18
-rw-r--r--website/migrations/0007_question_question_creation_day.py18
-rw-r--r--website/migrations/0008_auto_20181005_0535.py18
-rw-r--r--website/migrations/0009_auto_20181005_0538.py22
-rw-r--r--website/migrations/0010_auto_20181005_0544.py22
-rw-r--r--website/migrations/0011_auto_20181008_1039.py18
10 files changed, 2 insertions, 186 deletions
diff --git a/nccps2018/config.py b/nccps2018/config.py
index aea66d7..726ad2f 100755
--- a/nccps2018/config.py
+++ b/nccps2018/config.py
@@ -1,6 +1,6 @@
DB_NAME_DEFAULT = 'nccps'
DB_USER_DEFAULT = 'root'
-DB_PASS_DEFAULT = 'aero123'
+DB_PASS_DEFAULT = 'user123'
DB_HOST_DEFAULT = '127.0.0.1'
DB_PORT_DEFAULT = ''
########################################
diff --git a/website/migrations/0004_auto_20181004_1022.py b/website/migrations/0004_auto_20181004_1022.py
deleted file mode 100644
index 51067a7..0000000
--- a/website/migrations/0004_auto_20181004_1022.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Generated by Django 2.1 on 2018-10-04 10:22
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('website', '0003_auto_20180919_1026'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='AnswerPaper',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('validate_ans', models.BooleanField()),
- ('attempted', models.BooleanField()),
- ('date', models.DateTimeField(auto_now=True)),
- ],
- ),
- migrations.CreateModel(
- name='Question',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('question', models.TextField()),
- ('option_1', models.CharField(max_length=255)),
- ('option_2', models.CharField(max_length=255)),
- ('option_3', models.CharField(max_length=255)),
- ('option_4', models.CharField(max_length=255)),
- ('correct_answer', models.CharField(max_length=255)),
- ],
- ),
- migrations.AddField(
- model_name='answerpaper',
- name='answered_q',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='website.Question'),
- ),
- migrations.AddField(
- model_name='answerpaper',
- name='participant',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='website.Profile'),
- ),
- ]
diff --git a/website/migrations/0004_auto_20181010_0942.py b/website/migrations/0004_auto_20181012_0951.py
index 7d3f607..162c38e 100644
--- a/website/migrations/0004_auto_20181010_0942.py
+++ b/website/migrations/0004_auto_20181012_0951.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.1 on 2018-10-10 09:42
+# Generated by Django 2.1 on 2018-10-12 09:51
from django.db import migrations, models
import django.db.models.deletion
diff --git a/website/migrations/0005_auto_20181005_0408.py b/website/migrations/0005_auto_20181005_0408.py
deleted file mode 100644
index 04b52ef..0000000
--- a/website/migrations/0005_auto_20181005_0408.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 2.1 on 2018-10-05 04:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('website', '0004_auto_20181004_1022'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='question',
- name='question_day',
- field=models.DateField(null=True),
- ),
- migrations.AlterField(
- model_name='question',
- name='correct_answer',
- field=models.CharField(help_text='please write it as written in the option above(CAPS applicable)', max_length=255),
- ),
- ]
diff --git a/website/migrations/0006_auto_20181005_0412.py b/website/migrations/0006_auto_20181005_0412.py
deleted file mode 100644
index e2e9dd9..0000000
--- a/website/migrations/0006_auto_20181005_0412.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1 on 2018-10-05 04:12
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('website', '0005_auto_20181005_0408'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='question',
- name='question_day',
- field=models.DateField(),
- ),
- ]
diff --git a/website/migrations/0007_question_question_creation_day.py b/website/migrations/0007_question_question_creation_day.py
deleted file mode 100644
index 4dd8e82..0000000
--- a/website/migrations/0007_question_question_creation_day.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1 on 2018-10-05 04:26
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('website', '0006_auto_20181005_0412'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='question',
- name='question_creation_day',
- field=models.DateField(auto_now=True),
- ),
- ]
diff --git a/website/migrations/0008_auto_20181005_0535.py b/website/migrations/0008_auto_20181005_0535.py
deleted file mode 100644
index a24b0b3..0000000
--- a/website/migrations/0008_auto_20181005_0535.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1 on 2018-10-05 05:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('website', '0007_question_question_creation_day'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='question',
- name='question_day',
- field=models.DateField(auto_now=True),
- ),
- ]
diff --git a/website/migrations/0009_auto_20181005_0538.py b/website/migrations/0009_auto_20181005_0538.py
deleted file mode 100644
index c1709d2..0000000
--- a/website/migrations/0009_auto_20181005_0538.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 2.1 on 2018-10-05 05:38
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('website', '0008_auto_20181005_0535'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='question',
- name='question_creation_day',
- ),
- migrations.AlterField(
- model_name='question',
- name='question_day',
- field=models.DateField(),
- ),
- ]
diff --git a/website/migrations/0010_auto_20181005_0544.py b/website/migrations/0010_auto_20181005_0544.py
deleted file mode 100644
index 679f9dd..0000000
--- a/website/migrations/0010_auto_20181005_0544.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 2.1 on 2018-10-05 05:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('website', '0009_auto_20181005_0538'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='answerpaper',
- name='attempted',
- ),
- migrations.AlterField(
- model_name='question',
- name='question_day',
- field=models.DateField(help_text='Please follow the format YYYY-MM-DD as it is!'),
- ),
- ]
diff --git a/website/migrations/0011_auto_20181008_1039.py b/website/migrations/0011_auto_20181008_1039.py
deleted file mode 100644
index 8abca98..0000000
--- a/website/migrations/0011_auto_20181008_1039.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1 on 2018-10-08 10:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('website', '0010_auto_20181005_0544'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='question',
- name='question_day',
- field=models.DateField(),
- ),
- ]