Issue 2 Patch

Author: apb7

Diff for: CheckMate2017-master/checkmate2017/db.sqlite3

@@ -1,10 +1,10 @@
 from django.contrib import admin
-from .models import Answer,UserProfile, Question, Building, GameSwitch
+from .models import Answer,UserProfile, Question, Building, GameSwitch, TeamProfile
 # Register your models here.
 
 admin.site.register(UserProfile)
 admin.site.register(Question)
 admin.site.register(Building)
 admin.site.register(GameSwitch)
 admin.site.register(Answer)
-
+admin.site.register(TeamProfile)

Diff for: CheckMate2017-master/checkmate2017/mainapp/admin.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-09-17 17:10
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+import re
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mainapp', '0045_auto_20170913_2253'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TeamProfile',
+            fields=[
+                ('teamname', models.CharField(max_length=200)),
+                ('idno1', models.CharField(max_length=20, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(re.compile('^201[0-9]{1}[0-9A-Z]{4}[0-9]{4}P$', 32), code='invalid!', message='Enter your valid BITS-mail')])),
+            ],
+        ),
+    ]

Diff for: CheckMate2017-master/checkmate2017/mainapp/migrations/0046_teamprofile.py

@@ -56,3 +56,11 @@ class GameSwitch(models.Model):
 
 		def __str__(self):
 				return self.name
+
+class TeamProfile(models.Model):
+	teamname = models.CharField(max_length=200)
+	idno1 = models.CharField(max_length=20,primary_key=True, validators=[
+		validators.RegexValidator(re.compile('^201[0-9]{1}[0-9A-Z]{4}[0-9]{4}P$'), message='Enter your valid BITS-mail', code='invalid!')])
+
+	def __str__(self):
+    		return self.teamname

Diff for: CheckMate2017-master/checkmate2017/mainapp/models.py

@@ -1,7 +1,7 @@
 from django.core.urlresolvers import reverse
 from django.shortcuts import render
 from django.http import HttpResponse, Http404 ,HttpResponseForbidden
-from .models import UserProfile, GameSwitch, Building, Question, Answer
+from .models import UserProfile, GameSwitch, Building, Question, Answer, TeamProfile
 from django.shortcuts import redirect, render_to_response
 from django.contrib.auth import authenticate, login, logout as django_logout
 from django.contrib import auth
@@ -36,6 +36,21 @@ def register(request):
                 print (form)
                 print("reached1")
                 data = form.cleaned_data
+                ###  Patch for Issue 2
+                ###  TeamProfile object created here.
+                team = TeamProfile()
+                team.teamname = data['teamname1']
+                team.idno1 = data['idno1']
+                try:
+                    t = TeamProfile.objects.get(pk=data['idno1'])
+                    resp = {
+                        'status': 'error',
+                        'msg': 'BITS ID 1 has already been used to create a Team!  '
+                    }
+                    return HttpResponse(json.dumps(resp), content_type="application/json", status=500)
+                except Exception:
+                    team.save()
+                ### Patch Ends
                 u = User()
                 u.username = data['teamname1']
                 u.set_password(data['password1'])
@@ -48,6 +63,7 @@ def register(request):
                     'msg': 'Team name already registered or other conflicting entries'
                     }
                     return HttpResponse(json.dumps(resp), content_type = "application/json",status=500)
+                
                 up = UserProfile()
                 up.user = u
                 up.teamname = data['teamname1']
@@ -90,7 +106,7 @@ def register(request):
             print("reached3")
             return HttpResponse(json.dumps(r),content_type="application/json",status=301)
     else:
-        return HttpResponse('You have already registered once from this pc! Contact neartest ACM invigilator')
+        return HttpResponse('You have already registered once from this pc! Contact nearest ACM invigilator')
 
 
 def instructions(request):

Diff for: CheckMate2017-master/checkmate2017/mainapp/views.py

@@ -21,7 +21,7 @@ Some minor issues that were faced:( Has been assigned as small issues)
 
 2> IP based checks to be improved
 
-3> ID across teams 
+3> ID across teams: Has been resolved. For further information, refer to Issue 2. 
 
 
 To use the django project, create a virtual environment activate it. use pip install -r requirements to install required packages then python manage.py makemigrations python manange.py migrate python mange.py runserver