Project added

Author: abhishekspeer

myapp/__pycache__/apps.cpython-36.pyc

@@ -1,6 +1,10 @@
 from django.contrib import admin
+<<<<<<< HEAD
 from myapp.models import Userdata,Question
 
+=======
+from myapp.models import Userdata, Question
+>>>>>>> 15c0d9f25445e1d925802dc722da847d97cc5aa7
 # Register your models here.
 admin.site.register(Userdata)
 admin.site.register(Question)

myapp/__pycache__/signals.cpython-36.pyc

@@ -3,3 +3,9 @@
 
 class MyappConfig(AppConfig):
     name = 'myapp'
+<<<<<<< HEAD
+=======
+
+    def ready(self):
+        import myapp.signals
+>>>>>>> 15c0d9f25445e1d925802dc722da847d97cc5aa7

myapp/admin.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
+<<<<<<< HEAD
 # Generated by Django 1.11.5 on 2019-02-12 16:14
+=======
+# Generated by Django 1.11.5 on 2019-03-02 14:56
+>>>>>>> 15c0d9f25445e1d925802dc722da847d97cc5aa7
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -19,8 +23,13 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Question',
             fields=[
+<<<<<<< HEAD
                 ('question_no', models.AutoField(primary_key=True, serialize=False)),
                 ('reality_type', models.CharField(choices=[('magic', 'MAGIC'), ('robotics', 'MAGIC'), ('gaming', 'MAGIC'), ('mythology', 'MAGIC')], max_length=450, null=True)),
+=======
+                ('question_no', models.AutoField(default=True, primary_key=True, serialize=False)),
+                ('reality_type', models.CharField(choices=[('MAGIC', 'MAGIC'), ('ROBOTICS', 'ROBOTICS'), ('GAMING', 'GAMING'), ('MYTHOLOGY', 'MYTHOLOGY')], max_length=450, null=True)),
+>>>>>>> 15c0d9f25445e1d925802dc722da847d97cc5aa7
                 ('question', models.CharField(max_length=450, unique=True)),
                 ('choice1', models.CharField(max_length=450, null=True)),
                 ('choice2', models.CharField(max_length=450, null=True)),
@@ -33,10 +42,22 @@ class Migration(migrations.Migration):
             name='Userdata',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+<<<<<<< HEAD
                 ('bits_id', models.EmailField(max_length=254)),
                 ('score', models.PositiveIntegerField()),
                 ('reality_played', models.CharField(max_length=450, null=True)),
                 ('User', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+=======
+                ('bits_id', models.EmailField(blank=True, max_length=254, null=True)),
+                ('score', models.PositiveIntegerField(default=0)),
+                ('magicmarks', models.IntegerField(default=0)),
+                ('roboticsmarks', models.IntegerField(default=0)),
+                ('mythologymarks', models.IntegerField(default=0)),
+                ('ques_answered', models.CharField(blank=True, max_length=450, null=True)),
+                ('last_question', models.IntegerField(default=0)),
+                ('current_reality', models.IntegerField(default=0)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+>>>>>>> 15c0d9f25445e1d925802dc722da847d97cc5aa7
             ],
         ),
     ]

myapp/apps.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2019-03-03 11:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('myapp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='question',
+            name='question_no',
+            field=models.IntegerField(default=0, primary_key=True, serialize=False),
+        ),
+    ]

myapp/migrations/0001_initial.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2019-03-17 02:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('myapp', '0002_auto_20190303_1103'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userdata',
+            name='ques_answered',
+            field=models.CharField(blank=True, default='', max_length=450),
+        ),
+    ]

myapp/migrations/0002_auto_20190303_1103.py

@@ -11,20 +11,37 @@
 
 
 class Userdata(models.Model):
+<<<<<<< HEAD
     User = models.OneToOneField(User, on_delete=models.CASCADE)
     bits_id = models.EmailField()
     score = models.PositiveIntegerField()
     reality_played = models.CharField(max_length=450, null=True)
     magicmarks = models.IntegerField(default=0)
     roboticsmarks = models.IntegerField(default=0)
     mythologymarks = models.IntegerField(default=0)
+=======
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    bits_id = models.EmailField(blank=True, null=True)
+    score = models.PositiveIntegerField(default=0)
+    magicmarks = models.IntegerField(default=0)
+    roboticsmarks = models.IntegerField(default=0)
+    mythologymarks = models.IntegerField(default=0)
+    ques_answered = models.CharField(max_length=450, blank=True, default='')
+    last_question = models.IntegerField(default=0)
+    current_reality = models.IntegerField(default=0)
+>>>>>>> 15c0d9f25445e1d925802dc722da847d97cc5aa7
 
     # def __str__(self):
     #     return self.name
 
 
 class Question(models.Model):
+<<<<<<< HEAD
     question_no = models.AutoField(primary_key=True)
+=======
+    #question_no = models.AutoField(primary_key=True)
+    question_no = models.IntegerField(default=0, primary_key=True)
+>>>>>>> 15c0d9f25445e1d925802dc722da847d97cc5aa7
     reality_type = models.CharField(max_length=450, choices=REALITY_TYPES, null=True)
     question = models.CharField(max_length=450, unique=True)
     choice1 = models.CharField(max_length=450, null=True)
@@ -34,4 +51,8 @@ class Question(models.Model):
     correct_choice = models.CharField(max_length=450, null=True)
 
     def __str__(self):
+<<<<<<< HEAD
         return str(self.question_id)
+=======
+        return str(self.question_no)
+>>>>>>> 15c0d9f25445e1d925802dc722da847d97cc5aa7