Merge pull request #1 from arbisoft/dsheraz/university_list

update form to cater for university info

freshgrad_test/constants.py

@@ -0,0 +1,57 @@
+"""
+To contain various constants across the app.
+"""
+
+from django.utils.translation import gettext_lazy as _
+
+
+UNIVERSITIES = (
+ ('COMSATS', _("COMSATS")),
+ ('University of Engineering & Technology', _('University of Engineering & Technology')),
+ ('National University of Sciences & Technology', _('National University of Sciences & Technology')),
+ ('Bahria University', _('Bahria University')),
+ ('NAMAL', _('NAMAL')),
+ ('University of Gujrat', _('University of Gujrat')),
+ ('Islamia University of Bahawalpur', _('Islamia University of Bahawalpur')),
+ ('PUCIT', _('PUCIT')),
+ ('GIKI', _('GIKI')),
+ ('FAST', _('FAST')),
+ ('Superior University', _('Superior University')),
+ ('Imperial College', _('Imperial College')),
+ ('University of Central Punjab', _('University of Central Punjab')),
+ ('Forman Christian College', _('Forman Christian College')),
+ ('Szabist', _('Szabist')),
+ ('Lahore College for Women', _('Lahore College for Women')),
+ ('University of Lahore', _('University of Lahore')),
+ ('Kinnaird College', _('Kinnaird College')),
+ ('University of Management & Technology', _('University of Management & Technology')),
+ ('AJK University', _('AJK University')),
+ ('BZU Multan', _('BZU Multan')),
+ ('Islamia College University', _('Islamia College University')),
+ ('AIR University', _('AIR University')),
+ ('Information Technology University', _('Information Technology University')),
+ ('University of Peshawar', _('University of Peshawar')),
+ ('Virtual University', _('Virtual University')),
+ ('Lahore University of Management & Sciences', _('Lahore University of Management & Sciences')),
+ ('University of Sargodha', _('University of Sargodha')),
+ ('International Islamic University', _('International Islamic University')),
+ ('Other', _('Other'))
+)
+
+
+CAMPUS = (
+ ('Lahore', _('Lahore')),
+ ('Faisalabad', _('Faisalabad')),
+ ('Islamabad', _('Islamabad')),
+ ('Peshawar', _('Peshawar')),
+ ('Taxilla', _('Taxilla')),
+ ('Vehari', _('Vehari')),
+ ('Gujrat', _('Gujrat')),
+ ('Mianwali', _('Mianwali')),
+ ('Multan', _('Multan')),
+ ('Bahawalpur', _('Bahawalpur')),
+ ('Bahawalnagar', _('Bahawalnagar')),
+ ('Rahim Yar Khan', _('Rahim Yar Khan')),
+ ('Sargodha', _('Sargodha')),
+ ('Other', _('Other'))
+)

freshgrad_test/migrations/0004_auto_20191015_0801.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.25 on 2019-10-15 08:01
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('freshgrad_test', '0003_auto_20190520_0752'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='candidateinfo',
+ name='campus',
+ field=models.CharField(choices=[(b'Lahore', 'Lahore'), (b'Faisalabad', 'Faisalabad'), (b'Islamabad', 'Islamabad'), (b'Peshawar', 'Peshawar'), (b'Taxilla', 'Taxilla'), (b'Vehari', 'Vehari'), (b'Gujrat', 'Gujrat'), (b'Mianwali', 'Mianwali'), (b'Multan', 'Multan'), (b'Bahawalpur', 'Bahawalpur'), (b'Bahawalnagar', 'Bahawalnagar'), (b'Rahim Yar Khan', 'Rahim Yar Khan'), (b'Sargodha', 'Sargodha'), (b'Other', 'Other')], default='', max_length=30),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='candidateinfo',
+ name='other_university',
+ field=models.CharField(blank=True, max_length=50, verbose_name='University details, if not in list'),
+ ),
+ migrations.AlterField(
+ model_name='candidateinfo',
+ name='university',
+ field=models.CharField(choices=[(b'COMSATS', 'COMSATS'), (b'University of Engineering & Technology', 'University of Engineering & Technology'), (b'National University of Sciences & Technology', 'National University of Sciences & Technology'), (b'Bahria University', 'Bahria University'), (b'NAMAL', 'NAMAL'), (b'University of Gujrat', 'University of Gujrat'), (b'Islamia University of Bahawalpur', 'Islamia University of Bahawalpur'), (b'PUCIT', 'PUCIT'), (b'GIKI', 'GIKI'), (b'FAST', 'FAST'), (b'Superior University', 'Superior University'), (b'Imperial College', 'Imperial College'), (b'University of Central Punjab', 'University of Central Punjab'), (b'Forman Christian College', 'Forman Christian College'), (b'Szabist', 'Szabist'), (b'Lahore College for Women', 'Lahore College for Women'), (b'University of Lahore', 'University of Lahore'), (b'Kinnaird College', 'Kinnaird College'), (b'University of Management & Technology', 'University of Management & Technology'), (b'AJK University', 'AJK University'), (b'BZU Multan', 'BZU Multan'), (b'Islamia College University', 'Islamia College University'), (b'AIR University', 'AIR University'), (b'Information Technology University', 'Information Technology University'), (b'University of Peshawar', 'University of Peshawar'), (b'Virtual University', 'Virtual University'), (b'Lahore University of Management & Sciences', 'Lahore University of Management & Sciences'), (b'University of Sargodha', 'University of Sargodha'), (b'International Islamic University', 'International Islamic University'), (b'Other', 'Other')], max_length=60),
+ ),
+ ]

freshgrad_test/models.py

@@ -5,6 +5,8 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from .constants import CAMPUS, UNIVERSITIES
+
 # Backwards compatible settings.AUTH_USER_MODEL
 USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 
@@ -29,7 +31,11 @@ class CandidateInfo(models.Model):
  """
  user = models.OneToOneField(USER_MODEL)
  cnic_number = models.CharField(max_length=20, verbose_name=_("CNIC Number"))
- university = models.CharField(max_length=100)
+ university = models.CharField(max_length=60, choices=UNIVERSITIES)
+ campus = models.CharField(max_length=30, choices=CAMPUS)
+ other_university = models.CharField(
+ max_length=50, blank=True, verbose_name=_("University details, if not in list")
+ )
  city = models.CharField(max_length=30, verbose_name=_("Your current Location (City)"))
  address = models.CharField(max_length=255, verbose_name=_("Permanent Address"))
  contact_number = models.CharField(max_length=30, verbose_name=_("Contact Number(s)"))