--- a/app/projrev/models.py	Mon Aug 10 19:38:53 2009 +0530
+++ b/app/projrev/models.py	Tue Aug 11 03:38:51 2009 +0530
@@ -718,12 +718,13 @@
   # to in the state of India.
   district = models.CharField(max_length=256,
                               choices=sort_dict(DISTRICT_CHOICES),
-                              null=True)
+                              null=True, blank=True)
   district.help_text = ('First select the state before selecting the district. '
       'Select the district of the state where this project is taken up.')
 
-  mobile_num = models.CharField(max_length=20)
-  mobile_num.help_text = 'Enter your mobile number.'
+  phone_num = models.CharField(max_length=20)
+  phone_num.verbose_name = 'Phone Number'
+  phone_num.help_text = 'Enter your mobile number.'
 
   fax_num = models.CharField(max_length=20, null=True, blank=True)
   fax_num.help_text = 'Enter your fax number with the code.'
@@ -785,7 +786,10 @@
     """Get the District name from its code.
     """
 
-    return cls.DISTRICT_CHOICES[code]
+    if code in cls.DISTRICT_CHOICES:
+      return cls.DISTRICT_CHOICES[code]
+    else:
+      return None
 
   @classmethod
   def getDistrictCode(cls, name):
@@ -871,6 +875,7 @@
 
   #: Field containing the comment entered along with the review.
   comment = models.TextField()
+  comment.verbose_name = 'Overall Comment'
   comment.help_text = "Enter your review comment about this proposal."
 
   #: Field representing the reference to the person who
@@ -886,41 +891,77 @@
   attribute1.verbose_name = ('Feasibility of the proposed activity and the '
       'appropriateness of the time frame.')
 
+  comment_a1 = models.TextField(blank=True)
+  comment_a1.verbose_name = 'Comment'
+  comment_a1.help_text = "Comment for this attribute."
+
   attribute2 = models.PositiveSmallIntegerField(
       choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])
   attribute2.verbose_name = ('Uniqueness/novelty/innovation of the said '
       'proposal')
 
+  comment_a2 = models.TextField(blank=True)
+  comment_a2.verbose_name = 'Comment'
+  comment_a2.help_text = "Comment for this attribute."
+
   attribute3 = models.PositiveSmallIntegerField(
       choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])
   attribute3.verbose_name = ('Scope for inter-institutional collaboration and '
       'development.')
 
+  comment_a3 = models.TextField(blank=True)
+  comment_a3.verbose_name = 'Comment'
+  comment_a3.help_text = "Comment for this attribute."
+
   attribute4 = models.PositiveSmallIntegerField(
       choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])
   attribute4.verbose_name = ('The organisation of the programme to be carried '
       'out.')
 
+  comment_a4 = models.TextField(blank=True)
+  comment_a4.verbose_name = 'Comment'
+  comment_a4.help_text = "Comment for this attribute."
+
   attribute5 = models.PositiveSmallIntegerField(
       choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])
   attribute5.verbose_name = ('The details of the work as the outlined by the '
       'principal investigator(PI).')
 
+  comment_a5 = models.TextField(blank=True)
+  comment_a5.verbose_name = 'Comment'
+  comment_a5.help_text = "Comment for this attribute."
+
   attribute6 = models.PositiveSmallIntegerField(
       choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])
   attribute6.verbose_name = ('Sufficiency of funds as requested by the PI.')
 
+  comment_a6 = models.TextField(blank=True)
+  comment_a6.verbose_name = 'Comment'
+  comment_a6.help_text = "Comment for this attribute."
+
   attribute7 = models.PositiveSmallIntegerField(
       choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])
   attribute7.verbose_name = ('Social impact/reach/spread of the outcome of the '
       'proposal.')
 
+  comment_a7 = models.TextField(blank=True)
+  comment_a7.verbose_name = 'Comment'
+  comment_a7.help_text = "Comment for this attribute."
+
   attribute8 = models.PositiveSmallIntegerField(
       choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])
   attribute8.verbose_name = ('Contribution of the proposal to minimizing the '
       'digital divide in our country.')
 
+  comment_a8 = models.TextField(blank=True)
+  comment_a8.verbose_name = 'Comment'
+  comment_a8.help_text = "Comment for this attribute."
+
   attribute9 = models.PositiveSmallIntegerField(
       choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])
   attribute9.verbose_name = ('Any other matter which is likely to affect the '
       'execution of the project(max 600 characters).')
+
+  comment_a9 = models.TextField(blank=True)
+  comment_a9.verbose_name = 'Comment'
+  comment_a9.help_text = "Comment for this attribute."