Revision 63244bd1 crm/robocrm/models.py

View differences:

crm/robocrm/models.py
28 28
  cell = models.DecimalField(max_digits=10, decimal_places=0, blank=True, null=True)
29 29

  
30 30
  # Class Level
31
  FRESHMAN = 'FR'
32
  SOPHOMORE = 'SO'
33
  JUNIOR = 'JR'
34
  SENIOR = 'SR'
35
  MASTERS = 'MS'
36
  DOCTORAL = 'DR'
31
  UNDERGRAD = 'UG'
32
  GRADUATE = 'GR'
33
  AFFILIATE = 'AF'
34
  OTHER = 'OH'
37 35
  CLASS_LEVEL_CHOICES = (
38
      (FRESHMAN, 'Freshman'),
39
      (SOPHOMORE, 'Sophomore'),
40
      (JUNIOR, 'Junior'),
41
      (SENIOR, 'Senior'),
42
      (MASTERS, 'Masters'),
43
      (DOCTORAL, 'Doctoral'),
36
	(UNDERGRAD, 'Undergraduate'),
37
	(GRADUATE, 'Graduate Student'),
38
	(AFFILIATE, 'Non-Student CMU Affiliate'),
39
	(OTHER, 'Other User'),
44 40
  )
45 41
  class_level = models.CharField(max_length=2, 
46 42
                                 choices=CLASS_LEVEL_CHOICES,
47
                                 default=FRESHMAN)
43
                                 default=UNDERGRAD)
48 44

  
49 45
  # Graduation Year
50
  grad_year = models.DecimalField(max_digits=4, decimal_places=0)
46
  #grad_year = models.DecimalField(max_digits=4, decimal_places=0)
47
  grad_year = models.IntegerField(blank=True, null=True)
51 48

  
52 49
  # Primary and Secondary Major/Minors
53 50
  major = models.CharField(max_length=20)
......
68 65
                               default=JUNIOR_MEM)
69 66
  
70 67
  # Roboclub Transaction Info
71
  dues_paid = models.DateField()
68
  dues_paid = models.DateField(blank=True, null=True)
72 69
  tshirt_rec = models.BooleanField(default=False)
73 70
  
74 71
  # Shop and E-Bench Status

Also available in: Unified diff