diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..47685f2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,128 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+# Usually these files are written by a python script from a template
+# before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+# However, in case of collaboration, if having platform-specific dependencies or dependencies
+# having no cross-platform support, pipenv may install dependencies that don't work, or not
+# install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
diff --git a/CommitHistoryVisualizer/BlindCoding.gif b/CommitHistoryVisualizer/BlindCoding.gif
new file mode 100644
index 0000000..f8dca75
Binary files /dev/null and b/CommitHistoryVisualizer/BlindCoding.gif differ
diff --git a/CommitHistoryVisualizer/BlindCoding.mp4 b/CommitHistoryVisualizer/BlindCoding.mp4
new file mode 100644
index 0000000..71e09e8
Binary files /dev/null and b/CommitHistoryVisualizer/BlindCoding.mp4 differ
diff --git a/README.md b/README.md
index a11e9ce..9c01301 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,21 @@
# Blind Coding
## Bugs to be fixed/ Features to be added
+
- [X] Timer is not working properly, fix it
-- [ ] When user gets a question correct, automatically redirect to next question
-- [ ] Add a live leaderboard
-- [ ] Change frontend
-- [ ] Add details in about section
-- [ ] Cursor does not goes up in the editor, fix it
-- [ ] Do Backend stuff - do not put keys as it is within the files
+- [X] When user gets a question correct, automatically redirect to next question
+- [X] Add a live leaderboard
+- [X] Change frontend - Leaderboard opening animation is inserted, might require to change other background colors and stuff later.
+- [X] Add details in about section
+- [X] Cursor does not goes up in the editor, fix it
+- [X] Do Backend stuff - do not put keys as it is within the files
+- [X] Add feature to show code for sometime, say 5-10 seconds once per question
+- [X] Disable run button for the time compiler runs the code and returns the result to prevent multiple compiler runs
+- [X] Limit number of runs per question per user - feature not needed anymore
+- [X] Add Rank of the player to the leaderboard
+
+## Commit History Visualizer
+
+
+
+[video](CommitHistoryVisualizer/BlindCoding.mp4)
\ No newline at end of file
diff --git a/blind_coding/blind_coding/__pycache__/__init__.cpython-34.pyc b/blind_coding/blind_coding/__pycache__/__init__.cpython-34.pyc
deleted file mode 100644
index 2f25295..0000000
Binary files a/blind_coding/blind_coding/__pycache__/__init__.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/blind_coding/__pycache__/__init__.cpython-36.pyc b/blind_coding/blind_coding/__pycache__/__init__.cpython-36.pyc
deleted file mode 100644
index 320943e..0000000
Binary files a/blind_coding/blind_coding/__pycache__/__init__.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/blind_coding/__pycache__/settings.cpython-34.pyc b/blind_coding/blind_coding/__pycache__/settings.cpython-34.pyc
deleted file mode 100644
index 2314f71..0000000
Binary files a/blind_coding/blind_coding/__pycache__/settings.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/blind_coding/__pycache__/settings.cpython-36.pyc b/blind_coding/blind_coding/__pycache__/settings.cpython-36.pyc
deleted file mode 100644
index 35aa34b..0000000
Binary files a/blind_coding/blind_coding/__pycache__/settings.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/blind_coding/__pycache__/urls.cpython-34.pyc b/blind_coding/blind_coding/__pycache__/urls.cpython-34.pyc
deleted file mode 100644
index 6b9f58d..0000000
Binary files a/blind_coding/blind_coding/__pycache__/urls.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/blind_coding/__pycache__/urls.cpython-36.pyc b/blind_coding/blind_coding/__pycache__/urls.cpython-36.pyc
deleted file mode 100644
index 3b49435..0000000
Binary files a/blind_coding/blind_coding/__pycache__/urls.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/blind_coding/__pycache__/wsgi.cpython-34.pyc b/blind_coding/blind_coding/__pycache__/wsgi.cpython-34.pyc
deleted file mode 100644
index 1b36ab9..0000000
Binary files a/blind_coding/blind_coding/__pycache__/wsgi.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/blind_coding/__pycache__/wsgi.cpython-36.pyc b/blind_coding/blind_coding/__pycache__/wsgi.cpython-36.pyc
deleted file mode 100644
index 7a4707c..0000000
Binary files a/blind_coding/blind_coding/__pycache__/wsgi.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/blind_coding/settings.py b/blind_coding/blind_coding/settings.py
index 7aadd08..d4e7522 100644
--- a/blind_coding/blind_coding/settings.py
+++ b/blind_coding/blind_coding/settings.py
@@ -42,7 +42,6 @@
'django.contrib.staticfiles',
'allauth.socialaccount.providers.google',
'main_app.apps.MainAppConfig',
-
]
MIDDLEWARE = [
@@ -137,3 +136,6 @@
MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(REPOSITORY_ROOT, 'media/')
+
+clientId = "222a2ef84f6881409d32ae21369d1a32"
+clientSecret = "67872757630a355db890ee74b6b20926cb9e025dbb444182df2bd2700fc64af1"
diff --git a/blind_coding/db.sqlite3 b/blind_coding/db.sqlite3
index 8d05ab6..4d8b2a7 100644
Binary files a/blind_coding/db.sqlite3 and b/blind_coding/db.sqlite3 differ
diff --git a/blind_coding/main_app/__pycache__/__init__.cpython-34.pyc b/blind_coding/main_app/__pycache__/__init__.cpython-34.pyc
deleted file mode 100644
index c7f38f3..0000000
Binary files a/blind_coding/main_app/__pycache__/__init__.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/__init__.cpython-36.pyc b/blind_coding/main_app/__pycache__/__init__.cpython-36.pyc
deleted file mode 100644
index f8e19c5..0000000
Binary files a/blind_coding/main_app/__pycache__/__init__.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/admin.cpython-34.pyc b/blind_coding/main_app/__pycache__/admin.cpython-34.pyc
deleted file mode 100644
index a8f9ff4..0000000
Binary files a/blind_coding/main_app/__pycache__/admin.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/admin.cpython-36.pyc b/blind_coding/main_app/__pycache__/admin.cpython-36.pyc
deleted file mode 100644
index badf3bb..0000000
Binary files a/blind_coding/main_app/__pycache__/admin.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/apps.cpython-34.pyc b/blind_coding/main_app/__pycache__/apps.cpython-34.pyc
deleted file mode 100644
index 54d7a46..0000000
Binary files a/blind_coding/main_app/__pycache__/apps.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/models.cpython-34.pyc b/blind_coding/main_app/__pycache__/models.cpython-34.pyc
deleted file mode 100644
index 0a1b3c5..0000000
Binary files a/blind_coding/main_app/__pycache__/models.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/models.cpython-36.pyc b/blind_coding/main_app/__pycache__/models.cpython-36.pyc
deleted file mode 100644
index 4b4091c..0000000
Binary files a/blind_coding/main_app/__pycache__/models.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/signals.cpython-34.pyc b/blind_coding/main_app/__pycache__/signals.cpython-34.pyc
deleted file mode 100644
index 26720e7..0000000
Binary files a/blind_coding/main_app/__pycache__/signals.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/urls.cpython-34.pyc b/blind_coding/main_app/__pycache__/urls.cpython-34.pyc
deleted file mode 100644
index 45c79e9..0000000
Binary files a/blind_coding/main_app/__pycache__/urls.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/urls.cpython-36.pyc b/blind_coding/main_app/__pycache__/urls.cpython-36.pyc
index 303fe7b..c686f04 100644
Binary files a/blind_coding/main_app/__pycache__/urls.cpython-36.pyc and b/blind_coding/main_app/__pycache__/urls.cpython-36.pyc differ
diff --git a/blind_coding/main_app/__pycache__/views.cpython-34.pyc b/blind_coding/main_app/__pycache__/views.cpython-34.pyc
deleted file mode 100644
index 5ec62d0..0000000
Binary files a/blind_coding/main_app/__pycache__/views.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/__pycache__/views.cpython-36.pyc b/blind_coding/main_app/__pycache__/views.cpython-36.pyc
index 22d1c81..c6d899f 100644
Binary files a/blind_coding/main_app/__pycache__/views.cpython-36.pyc and b/blind_coding/main_app/__pycache__/views.cpython-36.pyc differ
diff --git a/blind_coding/main_app/admin.py b/blind_coding/main_app/admin.py
index 9e89a0c..3f569ee 100644
--- a/blind_coding/main_app/admin.py
+++ b/blind_coding/main_app/admin.py
@@ -1,7 +1,8 @@
from __future__ import unicode_literals
from django.contrib import admin
-from .models import Question,Userdata
+from .models import Question,Userdata,Time_Penalty
# Register your models here.
admin.site.register(Question)
admin.site.register(Userdata)
+admin.site.register(Time_Penalty)
\ No newline at end of file
diff --git a/blind_coding/main_app/migrations/0001_initial.py b/blind_coding/main_app/migrations/0001_initial.py
index 2332569..47557c3 100644
--- a/blind_coding/main_app/migrations/0001_initial.py
+++ b/blind_coding/main_app/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.13 on 2019-03-21 14:30
+# Generated by Django 2.2.7 on 2020-01-03 18:07
from django.conf import settings
from django.db import migrations, models
@@ -20,6 +20,9 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('qno', models.IntegerField(default=0)),
('text', models.CharField(max_length=45000)),
+ ('testcaseno', models.IntegerField(default=0)),
+ ('samplein', models.CharField(default='', max_length=45000)),
+ ('sampleout', models.CharField(default='', max_length=45000)),
('test_case1', models.CharField(max_length=1000)),
('test_case2', models.CharField(max_length=1000)),
('test_case3', models.CharField(max_length=1000)),
@@ -33,6 +36,9 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
+ ('score', models.IntegerField(default=0)),
+ ('answerGiven', models.CharField(default='00000', max_length=10)),
+ ('timeElapsed', models.IntegerField(default=0)),
('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
diff --git a/blind_coding/main_app/migrations/0002_auto_20200104_1324.py b/blind_coding/main_app/migrations/0002_auto_20200104_1324.py
new file mode 100644
index 0000000..a500cd2
--- /dev/null
+++ b/blind_coding/main_app/migrations/0002_auto_20200104_1324.py
@@ -0,0 +1,43 @@
+# Generated by Django 2.2.7 on 2020-01-04 07:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main_app', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='question',
+ name='weight',
+ field=models.IntegerField(default=10),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='userdata',
+ name='total_penalty',
+ field=models.IntegerField(default=0),
+ ),
+ migrations.CreateModel(
+ name='Time_Penalty',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('time_penalty', models.IntegerField(default=0)),
+ ('no_wa', models.IntegerField(default=0)),
+ ('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main_app.Userdata')),
+ ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='main_app.Question')),
+ ],
+ options={
+ 'unique_together': {('player', 'question')},
+ },
+ ),
+ migrations.AddField(
+ model_name='question',
+ name='time_penalty',
+ field=models.ManyToManyField(blank=True, null=True, through='main_app.Time_Penalty', to='main_app.Userdata'),
+ ),
+ ]
diff --git a/blind_coding/main_app/migrations/0002_question_qno.py b/blind_coding/main_app/migrations/0002_question_qno.py
deleted file mode 100644
index 8e01c0c..0000000
--- a/blind_coding/main_app/migrations/0002_question_qno.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1.7 on 2019-02-28 12:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='question',
- name='qno',
- field=models.IntegerField(default=0),
- ),
- ]
diff --git a/blind_coding/main_app/migrations/0003_auto_20190328_2312.py b/blind_coding/main_app/migrations/0003_auto_20190328_2312.py
deleted file mode 100644
index 86d9183..0000000
--- a/blind_coding/main_app/migrations/0003_auto_20190328_2312.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 2.0.13 on 2019-03-28 17:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0002_question_qno'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='question',
- name='samplein',
- field=models.CharField(default='', max_length=45000),
- ),
- migrations.AddField(
- model_name='question',
- name='sampleout',
- field=models.CharField(default='', max_length=45000),
- ),
- ]
diff --git a/blind_coding/main_app/migrations/0003_auto_20200104_1332.py b/blind_coding/main_app/migrations/0003_auto_20200104_1332.py
new file mode 100644
index 0000000..ff0fc09
--- /dev/null
+++ b/blind_coding/main_app/migrations/0003_auto_20200104_1332.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.7 on 2020-01-04 08:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main_app', '0002_auto_20200104_1324'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='question',
+ name='weight',
+ field=models.IntegerField(default=20),
+ ),
+ ]
diff --git a/blind_coding/main_app/migrations/0004_question_testcaseno.py b/blind_coding/main_app/migrations/0004_question_testcaseno.py
deleted file mode 100644
index 7139280..0000000
--- a/blind_coding/main_app/migrations/0004_question_testcaseno.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2019-03-28 17:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0003_auto_20190328_2312'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='question',
- name='testcaseno',
- field=models.IntegerField(default=0),
- ),
- ]
diff --git a/blind_coding/main_app/migrations/0005_userdata_score.py b/blind_coding/main_app/migrations/0004_userdata_chancesused.py
similarity index 67%
rename from blind_coding/main_app/migrations/0005_userdata_score.py
rename to blind_coding/main_app/migrations/0004_userdata_chancesused.py
index 35e682f..56bef1c 100644
--- a/blind_coding/main_app/migrations/0005_userdata_score.py
+++ b/blind_coding/main_app/migrations/0004_userdata_chancesused.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.13 on 2019-03-28 20:52
+# Generated by Django 2.2.7 on 2020-01-11 10:40
from django.db import migrations, models
@@ -6,13 +6,13 @@
class Migration(migrations.Migration):
dependencies = [
- ('main_app', '0004_question_testcaseno'),
+ ('main_app', '0003_auto_20200104_1332'),
]
operations = [
migrations.AddField(
model_name='userdata',
- name='score',
+ name='chancesUsed',
field=models.IntegerField(default=0),
),
]
diff --git a/blind_coding/main_app/migrations/0006_question_correctanswered.py b/blind_coding/main_app/migrations/0006_question_correctanswered.py
deleted file mode 100644
index 14f6228..0000000
--- a/blind_coding/main_app/migrations/0006_question_correctanswered.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2019-03-28 23:13
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0005_userdata_score'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='question',
- name='correctAnswered',
- field=models.IntegerField(default=0),
- ),
- ]
diff --git a/blind_coding/main_app/migrations/0007_auto_20190329_0445.py b/blind_coding/main_app/migrations/0007_auto_20190329_0445.py
deleted file mode 100644
index 9ede53a..0000000
--- a/blind_coding/main_app/migrations/0007_auto_20190329_0445.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated by Django 2.0.13 on 2019-03-28 23:15
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0006_question_correctanswered'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='question',
- name='correctAnswered',
- ),
- migrations.AddField(
- model_name='userdata',
- name='correctAnswered0',
- field=models.IntegerField(default=0),
- ),
- migrations.AddField(
- model_name='userdata',
- name='correctAnswered1',
- field=models.IntegerField(default=0),
- ),
- migrations.AddField(
- model_name='userdata',
- name='correctAnswered2',
- field=models.IntegerField(default=0),
- ),
- migrations.AddField(
- model_name='userdata',
- name='correctAnswered3',
- field=models.IntegerField(default=0),
- ),
- migrations.AddField(
- model_name='userdata',
- name='correctAnswered4',
- field=models.IntegerField(default=0),
- ),
- ]
diff --git a/blind_coding/main_app/migrations/0008_auto_20190329_0509.py b/blind_coding/main_app/migrations/0008_auto_20190329_0509.py
deleted file mode 100644
index 66741c0..0000000
--- a/blind_coding/main_app/migrations/0008_auto_20190329_0509.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated by Django 2.0.13 on 2019-03-28 23:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0007_auto_20190329_0445'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='userdata',
- name='correctAnswered0',
- ),
- migrations.RemoveField(
- model_name='userdata',
- name='correctAnswered1',
- ),
- migrations.RemoveField(
- model_name='userdata',
- name='correctAnswered2',
- ),
- migrations.RemoveField(
- model_name='userdata',
- name='correctAnswered3',
- ),
- migrations.RemoveField(
- model_name='userdata',
- name='correctAnswered4',
- ),
- migrations.AddField(
- model_name='userdata',
- name='answer',
- field=models.CharField(default='00000', max_length=5),
- ),
- ]
diff --git a/blind_coding/main_app/migrations/0009_auto_20190329_0613.py b/blind_coding/main_app/migrations/0009_auto_20190329_0613.py
deleted file mode 100644
index cbca258..0000000
--- a/blind_coding/main_app/migrations/0009_auto_20190329_0613.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2019-03-29 00:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0008_auto_20190329_0509'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='userdata',
- name='answer',
- field=models.CharField(default='00000', max_length=10),
- ),
- ]
diff --git a/blind_coding/main_app/migrations/0010_auto_20190329_0616.py b/blind_coding/main_app/migrations/0010_auto_20190329_0616.py
deleted file mode 100644
index 4053f76..0000000
--- a/blind_coding/main_app/migrations/0010_auto_20190329_0616.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2019-03-29 00:46
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0009_auto_20190329_0613'),
- ]
-
- operations = [
- migrations.RenameField(
- model_name='userdata',
- old_name='answer',
- new_name='answerGiven',
- ),
- ]
diff --git a/blind_coding/main_app/migrations/0011_userdata_timeelapsed.py b/blind_coding/main_app/migrations/0011_userdata_timeelapsed.py
deleted file mode 100644
index 19bf0c7..0000000
--- a/blind_coding/main_app/migrations/0011_userdata_timeelapsed.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2019-03-29 10:15
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('main_app', '0010_auto_20190329_0616'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='userdata',
- name='timeElapsed',
- field=models.IntegerField(default=0),
- ),
- ]
diff --git a/blind_coding/main_app/migrations/__pycache__/0001_initial.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0001_initial.cpython-34.pyc
deleted file mode 100644
index bc2784e..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0001_initial.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0001_initial.cpython-36.pyc b/blind_coding/main_app/migrations/__pycache__/0001_initial.cpython-36.pyc
deleted file mode 100644
index c86802b..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0001_initial.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0002_question_qno.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0002_question_qno.cpython-34.pyc
deleted file mode 100644
index e7edc1d..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0002_question_qno.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0002_question_qno.cpython-36.pyc b/blind_coding/main_app/migrations/__pycache__/0002_question_qno.cpython-36.pyc
deleted file mode 100644
index 1faadbf..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0002_question_qno.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0003_auto_20190328_2312.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0003_auto_20190328_2312.cpython-34.pyc
deleted file mode 100644
index 251724d..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0003_auto_20190328_2312.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0004_question_testcaseno.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0004_question_testcaseno.cpython-34.pyc
deleted file mode 100644
index 0485589..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0004_question_testcaseno.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0005_userdata_score.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0005_userdata_score.cpython-34.pyc
deleted file mode 100644
index f1c6a86..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0005_userdata_score.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0006_question_correctanswered.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0006_question_correctanswered.cpython-34.pyc
deleted file mode 100644
index 83bdaa1..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0006_question_correctanswered.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0007_auto_20190329_0445.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0007_auto_20190329_0445.cpython-34.pyc
deleted file mode 100644
index f3b6470..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0007_auto_20190329_0445.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0008_auto_20190329_0509.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0008_auto_20190329_0509.cpython-34.pyc
deleted file mode 100644
index 9de7703..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0008_auto_20190329_0509.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0009_auto_20190329_0613.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0009_auto_20190329_0613.cpython-34.pyc
deleted file mode 100644
index bc3d37d..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0009_auto_20190329_0613.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0010_auto_20190329_0616.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0010_auto_20190329_0616.cpython-34.pyc
deleted file mode 100644
index 912a628..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0010_auto_20190329_0616.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/0011_userdata_timeelapsed.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/0011_userdata_timeelapsed.cpython-34.pyc
deleted file mode 100644
index 418eaf6..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/0011_userdata_timeelapsed.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/__init__.cpython-34.pyc b/blind_coding/main_app/migrations/__pycache__/__init__.cpython-34.pyc
deleted file mode 100644
index 5cadd58..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/__init__.cpython-34.pyc and /dev/null differ
diff --git a/blind_coding/main_app/migrations/__pycache__/__init__.cpython-36.pyc b/blind_coding/main_app/migrations/__pycache__/__init__.cpython-36.pyc
deleted file mode 100644
index e2d02e2..0000000
Binary files a/blind_coding/main_app/migrations/__pycache__/__init__.cpython-36.pyc and /dev/null differ
diff --git a/blind_coding/main_app/models.py b/blind_coding/main_app/models.py
index f58d542..0eb95af 100644
--- a/blind_coding/main_app/models.py
+++ b/blind_coding/main_app/models.py
@@ -6,15 +6,19 @@ class Userdata(models.Model):
user_id=models.ForeignKey(User,on_delete=models.CASCADE)
name=models.CharField(max_length=100)
score = models.IntegerField(default = 0)
+ chancesUsed = models.IntegerField(default = 0)
answerGiven = models.CharField(max_length = 10, default="00000")
timeElapsed = models.IntegerField(default = 0)
-
+ total_penalty=models.IntegerField(default = 0)
+
def __str__(self):
return str(self.user_id.username)
class Question(models.Model):
qno=models.IntegerField(default=0)
+ weight = models.IntegerField(default=20)
text = models.CharField(max_length=45000)
+ time_penalty = models.ManyToManyField(Userdata, through="Time_Penalty",blank=True,null=True)
testcaseno=models.IntegerField(default=0)
samplein = models.CharField(max_length=45000,default='')
sampleout = models.CharField(max_length=45000,default='')
@@ -27,3 +31,15 @@ class Question(models.Model):
def __str__(self):
return str(self.pk)
+
+class Time_Penalty(models.Model):
+ player = models.ForeignKey(Userdata, on_delete=models.CASCADE)
+ question = models.ForeignKey(Question, on_delete=models.CASCADE,related_name='questions')
+ time_penalty = models.IntegerField(default=0)
+ no_wa = models.IntegerField(default=0)
+
+ class Meta:
+ unique_together = ("player", "question")
+
+ def __str__(self):
+ return "{} : {}".format(self.player.name, self.question.qno)
diff --git a/blind_coding/main_app/templates/index.html b/blind_coding/main_app/templates/index.html
index 161d8f5..df1272e 100644
--- a/blind_coding/main_app/templates/index.html
+++ b/blind_coding/main_app/templates/index.html
@@ -14,20 +14,24 @@