Merge pull request #36 from binson-b/scipy2016

Fixed Isssue #35
FOSSEE · Jul 30, 2018 · 6159c48 · 6159c48
2 parents 9c9fd7f + 8934023
commit 6159c48
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/certificate/views.py b/certificate/views.py
@@ -2446,9 +2446,7 @@ def create_fossee_internship_cerificate(
     error = False
     try:
         download_file_name = None
-        year = internship_project_duration[
-            internship_project_duration.find('to')-5:internship_project_duration.find('to')
-            ].strip()
+        year = internship_project_duration.split()[2]
         if wtype == 'P':
             template = 'template_FIC2016Pcertificate'
             download_file_name = 'FIC2016Pcertificate.pdf'
@@ -2544,7 +2542,7 @@ def fossee_internship16_cerificate_download(request):
         file_name = file_name.replace('.', '')
         try:
             old_user = Certificate.objects.get(email=email, serial_no=serial_no)
-            qrcode = 'Verify at: http://fossee.in/certificates/verify/{0} '.format(old_user.short_key)
+            qrcode = 'http://fossee.in/certificates/verify/{0} '.format(old_user.short_key)
             details = {'name': name, 'serial_key': old_user.short_key}
             certificate = create_fossee_internship_cerificate(certificate_path, details, qrcode, type, paper, internship_project_duration, 
                 student_edu_detail, student_institute_detail, superviser_name_detail, workshop, file_name)
@@ -2562,7 +2560,7 @@ def fossee_internship16_cerificate_download(request):
                     uniqueness = True
                 else:
                     num += 1
-            qrcode = 'Verify at: http://fossee.in/certificates/verify/{0} '.format(short_key)
+            qrcode = 'http://fossee.in/certificates/verify/{0} '.format(short_key)
             details = {'name': name,  'serial_key': short_key}
             certificate = create_fossee_internship_cerificate(certificate_path, details, qrcode, type, paper,
                           internship_project_duration, student_edu_detail, student_institute_detail, superviser_name_detail, workshop, file_name)
@@ -2676,7 +2674,7 @@ def python_workshop_download(request):
         file_name = file_name.replace('.', '')
         try:
             old_user = Certificate.objects.get(email=email, serial_no=serial_no)
-            qrcode = 'Verify at: http://fossee.in/certificates/verify/{0} '.format(old_user.short_key)
+            qrcode = 'http://fossee.in/certificates/verify/{0} '.format(old_user.short_key)
             details = {'name': name, 'serial_key': old_user.short_key}
             certificate = create_python_workshop_certificate(certificate_path, details,
                     qrcode, type, paper, workshop, file_name, college, ws_date, is_coordinator,format)
@@ -2694,7 +2692,7 @@ def python_workshop_download(request):
                     uniqueness = True
                 else:
                     num += 1
-            qrcode = 'Verify at: http://fossee.in/certificates/verify/{0} '.format(short_key)
+            qrcode = 'http://fossee.in/certificates/verify/{0} '.format(short_key)
             details = {'name': name,  'serial_key': short_key}
             certificate = create_python_workshop_certificate(certificate_path, details,
                     qrcode, type, paper, workshop, file_name, college, ws_date, is_coordinator,format)