Certificate request form is now only submitted once. The link shows if a…

Certificate request form is now only submitted once. The link shows if a certificate can be downloaded, or is still being generated.

djangoapps/certificates/migrations/0002_auto__add_field_generatedcertificate_download_url.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'GeneratedCertificate.download_url'
+        db.add_column('certificates_generatedcertificate', 'download_url',
+                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
+                      keep_default=False)
+
+    def backwards(self, orm):
+        # Deleting field 'GeneratedCertificate.download_url'
+        db.delete_column('certificates_generatedcertificate', 'download_url')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}),
+            'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
+            'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}),
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
+            'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
+            'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}),
+            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
+            'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'certificates.generatedcertificate': {
+            'Meta': {'object_name': 'GeneratedCertificate'},
+            'certificate_id': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'download_url': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['certificates']
\ No newline at end of file

djangoapps/certificates/models.py

@@ -18,6 +18,4 @@ class GeneratedCertificate(models.Model):
     user = models.ForeignKey(User, db_index=True)
     certificate_id = models.CharField(max_length=32)
     
-    # TODO: Maybe we store the grade when the certificate was
-    # generated, so we can tell the user if their grade improves?
-    # Can a grade improve?
\ No newline at end of file
+    download_url = models.CharField(max_length=128, null=True)
\ No newline at end of file

djangoapps/certificates/views.py

@@ -12,6 +12,13 @@ from certificates.models import GeneratedCertificate
 
 log = logging.getLogger("mitx.certificates")
 
+# @login_required
+# def record_exit_survey(request):
+#     if request.method != "POST":
+#         raise Http404
+#     
+#     
+
 
 @login_required
 def certificate_request(request):

djangoapps/courseware/views.py

@@ -21,6 +21,7 @@ from django_future.csrf import ensure_csrf_cookie
 from lxml import etree
 
 from module_render import render_module, modx_dispatch
+from certificates.models import GeneratedCertificate
 from models import StudentModule
 from student.models import UserProfile
 
@@ -69,6 +70,21 @@ def profile(request, student_id = None):
         student = User.objects.get( id = int(student_id))
 
     user_info = UserProfile.objects.get(user=student) # request.user.profile_cache # 
+    
+    grade_sheet = grades.grade_sheet(student)
+    
+    generated_certificate = None
+    certificate_download_url = None
+    certificate_requested = False
+    if grade_sheet['grade']:
+        try:
+            generated_certificate = GeneratedCertificate.objects.get(user = student)
+            certificate_requested = True
+            certificate_download_url = generated_certificate.download_url
+        except GeneratedCertificate.DoesNotExist:
+            #They haven't submited the request form
+            certificate_requested = False
+    
 
     context={'name':user_info.name,
              'username':student.username,
@@ -78,7 +94,9 @@ def profile(request, student_id = None):
              'format_url_params' : content_parser.format_url_params,
              'csrf':csrf(request)['csrf_token'],
              'grade_cutoffs' : course_settings.GRADE_CUTOFFS,
-             'grade_sheet' : grades.grade_sheet(student),
+             'grade_sheet' : grade_sheet,
+             'certificate_requested' : certificate_requested,
+             'certificate_download_url' : certificate_download_url,
              }
 
     return render_to_response('profile.html', context)

templates/profile.html

@@ -158,8 +158,14 @@ $(function() {
       <div id="grade">
         %if grade_sheet['grade']:
           <p>Final Grade: <strong>${grade_sheet['grade']}</strong></p>
-
-          <a rel="leanModal" class="cert_request" href="#cert_request">Request Certificate</a>
+          
+          %if not certificate_requested:
+            <a rel="leanModal" class="cert_request" href="#cert_request">Request Certificate</a>
+          %elif certificate_download_url:
+            <a class="cert_request" href="${certificate_download_url}">Download Certificate</a>
+          %else:
+            <a class="cert_request" href="#">Certificate is being generated...</a>
+          %endif
         %else:
           <p> No letter grade has been earned for this course </p>
         %endif
@@ -366,3 +372,34 @@ $(function() {
 </div>
 %endif
 
+<div id="survey" class="leanModal_box">
+  <h1>6.002x Student Survey</h1>
+  <p>Please take this short survey about 6.002x.</p>
+  
+  <form id="survey_form">
+    <div id="survey_error"> </div>
+    <fieldset>
+      <ul>
+        <li>
+          <input type="checkbox" id="survey_future_classes"/>
+          <label> Please inform me of future classes offered by edX.</label>
+        </li>
+        <li>
+          <input type="checkbox" id="survey_future_offerings"/>
+          <label> Please inform me of opportunities to help with future offerings of 6.002x, such as staffing discussiong forums or developing content. </label>
+        </li>
+        <li>
+          <input type="checkbox" id="survey_6002x_updates"/>
+          <label> Please subscribe me to periodic updates about additional topics, refreshers, and follow-ups for topics in 6.002x. </label>
+        </li>
+        
+        <li>
+          <input type="submit" id="" value="Record Survey Response" />
+        </li>
+      </ul>
+    </fieldset>
+  </form>
+</div>
+
+
+