diff options
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | nccps2018/settings.py | 10 | ||||
| -rw-r--r-- | static/website/templates/index.html | 2 | ||||
| -rw-r--r-- | static/website/templates/navbar.html | 4 | ||||
| -rw-r--r-- | static/website/templates/quiz_intro.html | 5 | ||||
| -rw-r--r-- | website/migrations/0004_auto_20181010_0942.py | 45 |
6 files changed, 56 insertions, 11 deletions
@@ -18,7 +18,6 @@ static/tmp/ db.sqlite3 # Django Migration files -migrations/ #MAC OS specific .DS_Store
\ No newline at end of file diff --git a/nccps2018/settings.py b/nccps2018/settings.py index bf7f493..db36bd8 100644 --- a/nccps2018/settings.py +++ b/nccps2018/settings.py @@ -80,11 +80,11 @@ WSGI_APPLICATION = 'nccps2018.wsgi.application' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - 'TEST': { - 'NAME': 'mytestdatebase', - }, + 'ENGINE': 'django.db.backends.mysql', + 'NAME': DB_NAME_DEFAULT, # Or path to database file if using sqlite3. + 'USER': DB_USER_DEFAULT, + 'PASSWORD': DB_PASS_DEFAULT, + 'HOST': DB_HOST_DEFAULT, } } diff --git a/static/website/templates/index.html b/static/website/templates/index.html index 9d36028..751f347 100644 --- a/static/website/templates/index.html +++ b/static/website/templates/index.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load static %} {% block content %} - <div class="se-pre-con"></div> + <!-- <div class="se-pre-con"></div> --> {% include 'home.html' %} {% endblock %} diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html index 43f8d72..d820d5d 100644 --- a/static/website/templates/navbar.html +++ b/static/website/templates/navbar.html @@ -37,7 +37,7 @@ <li><a data-scroll href="{{SITE_URL}}/#coc">C0C</a></li> <li><a data-scroll href="{{SITE_URL}}/#schedule">Schedule</a></li> <li><a data-scroll href="{{SITE_URL}}/#location">Venue</a></li> - <li><a data-scroll href="{{SITE_URL}}/#organiser">Organiser</a></li> + <!--<li><a data-scroll href="{{SITE_URL}}/#organiser">Organiser</a></li> --> <li><a data-scroll href="{{SITE_URL}}/#contact-us">Contact Us</a></li> <li><a href="{% url 'website:dwsimquiz' %}">DWSIM QUIZ</a></li> <li><a href="{% url 'website:cfp' %}">cfp</a></li> @@ -52,7 +52,7 @@ {% if request.user.is_staff %} <li><a href="{% url 'website:question_list' %}">View Questions</a></li> {% else %} - <li><a href="{% url 'website:proposal' %}">Submit your Paper</a></li> + <!--<li><a href="{% url 'website:proposal' %}">Submit your Paper</a></li> --> <li><a href="{% url 'website:quiz_intro' %}">Take Quiz</a></li> {% endif %} <!-- <li><a href="{{SITE_URL}}/#registration">Book your Ticket</a></li> --> diff --git a/static/website/templates/quiz_intro.html b/static/website/templates/quiz_intro.html index ca66825..2575de1 100644 --- a/static/website/templates/quiz_intro.html +++ b/static/website/templates/quiz_intro.html @@ -33,7 +33,7 @@ </ul> <h5>Guidelines</h5> <ul> -<li><strong>Use DWSIM Version 5.3</strong> for simulating the problem statement. This version will be followed throughout the competition.</li> + <li>Use <strong>DWSIM Version 5.3</strong> for simulating the problem statement. This version will be followed throughout the competition.</li> <li>Correct option for the displayed questions will be based on problem statement simulated using <strong>DWSIM Version 5.3</strong>.</li> <li>The new questions for the day will be available to attempt from 12:00 AM of that day to 11:59 PM of the same day.</li> <li>In case you are logged out of the session before clicking on Submit button, please go and re-attempt the quiz.</li> @@ -43,7 +43,8 @@ <li>Participant cannot re-attempt the quiz for the day once they have submitted their answers for that day.</li> <li>Every correct answer will carry +1 mark and wrong answers will not be rewarded any marks.</li> <li>Winners will be declared based on highest score obtained throughout the competition.</li> - </ul> + </ul><br> + <p style="text-align: center;"><strong>Link for Quiz will be active from 15-10-2018</strong></p> </div> </div> <br> diff --git a/website/migrations/0004_auto_20181010_0942.py b/website/migrations/0004_auto_20181010_0942.py new file mode 100644 index 0000000..7d3f607 --- /dev/null +++ b/website/migrations/0004_auto_20181010_0942.py @@ -0,0 +1,45 @@ +# Generated by Django 2.1 on 2018-10-10 09:42 + +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()), + ('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(help_text='please write it as written in the option above(Case-sensitive)', max_length=255)), + ('question_day', models.DateField()), + ], + ), + 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'), + ), + ] |