Index: main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/level_report.py
===================================================================
--- main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/level_report.py	(revision 18306)
+++ main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/level_report.py	(revision 18307)
@@ -18,10 +18,67 @@
 
 import grok
+import textwrap
 from zope.interface import implementer, Interface, Attribute
+from zope.component import queryUtility, getUtility
+from zope.i18n import translate
+from zope.catalog.interfaces import ICatalog
+
+from reportlab.lib import colors
+from reportlab.lib.styles import getSampleStyleSheet
+from reportlab.lib.units import cm
+from reportlab.platypus import Paragraph, Table, Spacer
+from reportlab.platypus.flowables import Flowable
+
+from waeup.kofa.reports import IReport, IReportGenerator
+from waeup.kofa.reports import Report
+from waeup.kofa.browser.interfaces import IPDFCreator
+from waeup.kofa.browser.pdf import SMALL_PARA_STYLE
+from waeup.kofa.interfaces import (
+    IKofaUtils, GRADUATED,
+    academic_sessions_vocab, registration_states_vocab)
+
 from waeup.kofa.students.reports.level_report import (
     LevelReport, LevelReportGenerator,
     ILevelReport, LevelReportGeneratorPage,
-    LevelReportPDFView)
-
+    LevelReportPDFView,
+    TABLE_STYLE,
+    TTR)
+
+STYLE = getSampleStyleSheet()
+
+
+def tbl_data_to_table(data):
+    result = []
+    col_names = (
+            'S/N',
+            'Matric No.',
+            'Student Name',
+            TTR('Total Credits Taken'),
+            TTR('Total Credits Passed'),
+            TTR('GPA'),
+            'Courses Failed',
+            'Outstanding Courses',
+            TTR('Cum. Credits Taken'),
+            TTR('Cum. Credits Passed'),
+            TTR('Cum. Credits Required'),
+            TTR('CGPA'),
+            TTR('Remark'))
+    table = [col_names]
+    sn = 1
+    for line in data:
+        # Underline mandatory (core) courses
+        failed_courses = Paragraph(
+            line[5].replace(
+                'm_', '<u>').replace('_m', '</u>'), SMALL_PARA_STYLE)
+        line = line[:5] + (failed_courses,) + line[6:]
+        # Superscript in remarks (needed by AAUE)
+        remark = Paragraph(
+            line[10].replace(
+                's_', '<super>').replace('_s', '</super>'), SMALL_PARA_STYLE)
+        line = line[:10] + (remark,)
+        line = (sn,) + line
+        table.append(line)
+        sn += 1
+    return table
 
 # Level Report for graduating students only
@@ -37,10 +94,9 @@
     """
 
-    # title = 'Summary of Results'
     title = 'Level Report (Graduating Students only)'
 
     @property
     def right_footer(self):
-        return self.title + ' (Graduating Students) - %s -' % self.session
+        return self.title + ' - %s -' % self.session
 
     def _excluded(self, level_obj):
@@ -52,9 +108,118 @@
         if final_level > level_obj.level:
             return True
-        #if level_obj.remark not in (
-        #    'Pass', '3s_rd_s', '2s_2_s', '2s_1_s', '1s_st_s',
-        #    'Merit', 'Credit', 'Distinction'):
-        #    return True
-        #return False
+        if level_obj.remark not in (
+            'Pass', '3s_rd_s', '2s_2_s', '2s_1_s', '1s_st_s',
+            'Merit', 'Credit', 'Distinction'):
+            return True
+        return False
+
+    def _get_students(self, faccode, depcode, certcode, session, level):
+        """Get students in a certain department, studying a certain programmen
+        who registered courses in a certain session at a certain level.
+
+        Returns a list of student data tuples.
+        """
+        site = grok.getSite()
+        cat = queryUtility(ICatalog, name="students_catalog")
+        if certcode == 'all':
+            certcode = None
+        result = cat.searchResults(
+            depcode = (depcode, depcode), faccode = (faccode, faccode),
+            certcode = (certcode, certcode)
+            )
+        table = []
+        format_float = getUtility(IKofaUtils).format_float
+        for stud in result:
+            if not stud['studycourse'].has_key(str(level)):
+                continue
+            if stud.state == GRADUATED:
+                continue
+            level_obj = stud['studycourse'][str(level)]
+            if level_obj.level_session != session:
+                continue
+            if self._excluded(level_obj):
+                continue
+            passed_params = level_obj.passed_params
+            failed_courses = textwrap.fill(passed_params[4], 35)
+            not_taken_courses = textwrap.fill(passed_params[5], 17)
+            fullname = textwrap.fill(stud.display_fullname, 29)
+            remark = getattr(level_obj, 'remark', '')
+            cert = stud['studycourse'].certificate
+            end_level = getattr(cert, 'end_level', None)
+            tcrg = getattr(cert, 'custom_float_1', None)
+            credits_counted = level_obj.gpa_params[1]
+            credits_passed = passed_params[2]
+            level_gpa = format_float(level_obj.gpa_params[0], 2)
+            cum_credits_taken = level_obj.cumulative_params[1]
+            cum_credits_passed = level_obj.cumulative_params[4]
+            if end_level and level >= end_level:
+                cgpa = format_float(level_obj.cumulative_params[0], 2)
+            else:
+                cgpa = format_float(level_obj.cumulative_params[0], 3)
+            if remark in ('FRNS', 'NER', 'NYV'):
+                cgpa = ''
+                if remark in ('NER', 'NYV'):
+                    # hide all data (requestd by AAUE, Nigeria)
+                    credits_counted = ''
+                    credits_passed = ''
+                    level_gpa = ''
+                    failed_courses = ''
+                    not_taken_courses = ''
+                    cum_credits_taken = ''
+                    cum_credits_passed = ''
+            line = (
+                    stud.matric_number,
+                    fullname,
+                    credits_counted,
+                    credits_passed,
+                    level_gpa,
+                    failed_courses,
+                    not_taken_courses,
+                    cum_credits_taken,
+                    cum_credits_passed,
+                    tcrg,
+                    cgpa,
+                    remark,
+                    )
+            table.append(line)
+        return sorted(table, key=lambda value:value[0])
+
+    def create_pdf(self, job_id):
+        creator = getUtility(IPDFCreator, name=self.pdfcreator)
+        table_data = tbl_data_to_table(self.data)
+        #col_widths = [3.5*cm] * len(self.data[0])
+        col_widths = [1*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 1*cm,
+                      5.2*cm, 3*cm, 0.8*cm, 0.8*cm, 0.8*cm, 1*cm, 2*cm]
+        pdf_data = [Paragraph('<b>%s - Report %s</b>'
+                              % (self.creation_dt_string, job_id),
+                              STYLE["Normal"]),
+                    Spacer(1, 12),]
+        pdf_data += [Paragraph(
+                    translate(
+                        '${a}<br />${b}<br />${c}<br />'
+                        'Session: ${d}<br />Level: ${e}',
+                        mapping = {'a':self.certtitle,
+                                   'b':self.deptitle,
+                                   'c':self.factitle,
+                                   'd':self.session,
+                                   'e':self.level,
+                                   }),
+                    STYLE["Normal"]),
+                    Spacer(1, 12),]
+        pdf_data += [
+            Table(table_data, style=TABLE_STYLE, colWidths=col_widths)]
+
+        pdf_data.append(Spacer(1, 40))
+        if self.signatures:
+            signaturetables = get_signature_tables(
+                self.signatures, landscape=True)
+            pdf_data.append(signaturetables[0])
+
+        pdf = creator.create_pdf(
+            pdf_data, None, self.title, self.author,
+            self.right_footer, note = self.note
+            )
+        return pdf
+
 
 class GradLevelReportGenerator(LevelReportGenerator):
Index: main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/__init__.py
===================================================================
--- main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/__init__.py	(revision 18307)
+++ main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/__init__.py	(revision 18307)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/test_level_report.py
===================================================================
--- main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/test_level_report.py	(revision 18307)
+++ main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/test_level_report.py	(revision 18307)
@@ -0,0 +1,76 @@
+import os
+from zc.async.testing import wait_for_result
+from zope.interface.verify import verifyClass, verifyObject
+from zope.component import getUtility
+from waeup.kofa.interfaces import IJobManager
+from waeup.kofa.students.reports.level_report import ILevelReport
+from waeup.kofa.students.tests.test_catalog import CatalogTestSetup
+from waeup.kofa.students.tests.test_browser import StudentsFullSetup
+from waeup.kofa.browser.tests.test_pdf import samples_dir
+
+from kofacustom.unidel.students.reports.level_report import (
+    #CustomLevelReport,
+    GradLevelReport,
+    IGradLevelReport)
+
+from kofacustom.unidel.testing import FunctionalLayer
+
+
+class GradLevelReportTests(CatalogTestSetup):
+
+    layer = FunctionalLayer
+
+    def test_iface(self):
+        # ensure we fullfill interface contracts
+        obj = GradLevelReport('fac1', 'dep1', 'CERT1', 2010, 100)
+        verifyClass(IGradLevelReport, GradLevelReport)
+        verifyObject(IGradLevelReport, obj)
+        return
+
+    def test_get_students(self):
+        self.student['studycourse']['100']['Course1'].ca = 0
+        lr =  GradLevelReport('fac1', 'dep1', 'CERT1', 2010, 100)
+        # this is not a graduating student
+        result = lr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
+        self.assertEqual(result, [])
+        # if end level is 100, the student seems graduating and
+        # we can get a table with one student
+        self.certificate.end_level = 100
+        self.certificate.custom_float_1 = 77
+        self.student['studycourse']['100']['Course1'].credits = 91
+        result = lr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
+        self.assertEqual(result,
+            [(u'1234', u'Bob Tester', 91, 91, '5.00',
+               'Nil', 'Nil', 91, 91, 77,'5.00', '1s_st_s')])
+        return
+
+    def test_create_pdf(self):
+        self.student['studycourse']['100']['Course1'].ca = 0
+        self.student['studycourse']['100']['Course1'].credits = 91
+        self.certificate.end_level = 100
+        self.certificate.custom_float_1 = 77
+        self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine - Dean of Faculty'
+        self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine - Head of Department'
+        report = GradLevelReport('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = report.create_pdf('JOB_ID')
+        self.assertTrue(result.startswith('%PDF-'))
+        path = os.path.join(samples_dir(), 'grad_level_report.pdf')
+        open(path, 'wb').write(result)
+        print "Sample grad_level_report.pdf written to %s" % path
+        return
+
+    def test_create_dp_pdf(self):
+        self.certificate.study_mode = 'dp_ft'
+        self.student['studycourse']['100']['Course1'].ca = 0
+        self.student['studycourse']['100']['Course1'].credits = 91
+        self.certificate.end_level = 100
+        self.certificate.custom_float_1 = 77
+        self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine - Dean of Faculty'
+        self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine - Head of Department'
+        report = GradLevelReport('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = report.create_pdf('JOB_ID')
+        self.assertTrue(result.startswith('%PDF-'))
+        path = os.path.join(samples_dir(), 'dp_grad_level_report.pdf')
+        open(path, 'wb').write(result)
+        print "Sample dp_grad_level_report.pdf written to %s" % path
+        return
Index: main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/studylevel.py
===================================================================
--- main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/studylevel.py	(revision 18306)
+++ main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/studylevel.py	(revision 18307)
@@ -21,4 +21,5 @@
 """
 import grok
+import decimal
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
@@ -30,4 +31,5 @@
 from kofacustom.unidel.students.interfaces import (
     ICustomStudentStudyLevel, ICustomCourseTicket)
+from kofacustom.unidel.students.utils import MINIMUM_UNITS_THRESHOLD
 
 
@@ -91,4 +93,119 @@
                total_credits, credits_passed)
 
+    @property
+    def passed_params(self):
+        """Determine the number and credits of passed and failed courses.
+        This method is used for level reports.
+        """
+        passed = failed = 0
+        courses_failed = ''
+        credits_failed = 0
+        credits_passed = 0
+        courses_not_taken = ''
+        courses_passed = ''
+        for ticket in self.values():
+            if ticket.total_score is not None:
+                if ticket.total_score < ticket.passmark:
+                    failed += 1
+                    credits_failed += ticket.credits
+                    if ticket.mandatory or ticket.course_category == 'C':
+                        courses_failed += 'm_%s_m ' % ticket.code
+                    else:
+                        courses_failed += '%s ' % ticket.code
+                else:
+                    passed += 1
+                    credits_passed += ticket.credits
+                    courses_passed += '%s ' % ticket.code
+            else:
+                courses_not_taken += '%s ' % ticket.code
+        if not len(courses_failed):
+            courses_failed = 'Nil'
+        if not len(courses_not_taken):
+            courses_not_taken = 'Nil'
+        return (passed, failed, credits_passed,
+                credits_failed, courses_failed,
+                courses_not_taken, courses_passed)
+
+    # only AAUE and Unidel
+    @property
+    def remark(self):
+        certificate = getattr(self.__parent__,'certificate',None)
+        end_level = getattr(certificate, 'end_level', None)
+        study_mode = getattr(certificate, 'study_mode', None)
+        tcrg = getattr(certificate, 'custom_float_1', None)
+        value = decimal.Decimal(str(self.cumulative_params[0]))
+        cgpa = round(value,2)
+        #cgpa = self.cumulative_params[0]
+        is_dp = False
+        if study_mode and study_mode.startswith('dp'):
+            is_dp = True
+        failed_limit = 1.5
+        if self.student.entry_session < 2013:
+            failed_limit = 1.0
+        # final level student remark
+        if end_level and self.level >= end_level:
+            if self.level > end_level:
+                # spill-over level
+                if self.gpa_params[1] == 0:
+                    # no credits taken
+                    return 'NER'
+            elif self.cumulative_params[4] < tcrg:
+                return 'FRNS'
+            if self.level_verdict in ('FRNS', 'NER', 'NYV'):
+                return self.level_verdict
+            if '_m' in self.passed_params[4]:
+                return 'FRNS'
+            if not self.cumulative_params[0]:
+                return 'FRNS'
+            if len(self.passed_params[5]) \
+                and not self.passed_params[5] == 'Nil':
+                return 'FRNS'
+            if self.cumulative_params[1] < 60:
+                return 'FRNS'
+            if cgpa < failed_limit:
+                return 'Fail'
+            dummy, repeat = divmod(self.level, 100)
+            if cgpa < 5.1 and repeat == 20:
+                # Irrespective of the CGPA of a student, if the He/She has
+                # 3rd Extension, such student will be graduated with a "Pass".
+                return 'Pass'
+            if cgpa < 1.5:
+                if is_dp:
+                    return 'Fail'
+                return 'Pass'
+            if cgpa < 2.4:
+                if is_dp:
+                    return 'Pass'
+                return '3s_rd_s'
+            if cgpa < 3.5:
+                if is_dp:
+                    return 'Merit'
+                return '2s_2_s'
+            if cgpa < 4.5:
+                if is_dp:
+                    return 'Credit'
+                return '2s_1_s'
+            if cgpa < 5.1:
+                if is_dp:
+                    return 'Distinction'
+                return '1s_st_s'
+            return 'N/A'
+        # returning student remark
+        if self.level_verdict in ('FRNS', 'NER', 'NYV'):
+            return 'Probation'
+        if self.level_verdict == 'D':
+            return 'Withdrawn'
+        if self.gpa_params[1] == 0:
+            # no credits taken
+            return 'NER'
+        if self.gpa_params[1] < MINIMUM_UNITS_THRESHOLD:
+            # credits taken below limit
+            return 'Probation'
+        if cgpa < failed_limit:
+            return 'Probation'
+        if cgpa < 5.1:
+            return 'Proceed'
+        return 'N/A'
+
 CustomStudentStudyLevel = attrs_to_fields(
     CustomStudentStudyLevel, omit=['total_credits', 'gpa',
Index: main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/tests/test_export.py
===================================================================
--- main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/tests/test_export.py	(revision 18306)
+++ main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/tests/test_export.py	(revision 18307)
@@ -47,28 +47,25 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'adm_code,alr_date,alr_fname,alr_no,alr_results,'
-            'clr_code,date_of_birth,def_adm,disabled,email,email2,emp2_end,'
-            'emp2_position,emp2_reason,emp2_start,emp_end,emp_position,'
-            'emp_reason,emp_start,employer,employer2,'
-            'final_clearance_date,finally_cleared_by,'
-            'financial_clearance_date,financially_cleared_by,'
-            'firstname,flash_notice,former_matric,'
-            'fst_sit_date,fst_sit_fname,fst_sit_no,fst_sit_results,'
-            'fst_sit_type,hq2_degree,hq2_disc,hq2_matric_no,hq2_school,'
-            'hq2_session,hq2_type,hq_degree,hq_disc,hq_fname,hq_matric_no,'
-            'hq_school,hq_session,hq_type,is_staff,lastname,lga,'
-            'marit_stat,matric_number,middlename,nationality,'
-            'next_kin_address,next_kin_name,next_kin_phone,next_kin_relation,'
-            'nysc_lga,nysc_location,nysc_year,officer_comment,parents_email,'
-            'password_updated,perm_address,personal_updated,phone,'
-            'physical_clearance_date,provisionally_cleared,reg_number,'
-            'religion,scd_sit_date,scd_sit_fname,scd_sit_no,'
-            'scd_sit_results,scd_sit_type,sex,student_id,'
-            'suspended,suspended_comment,password,state,history,certcode,is_postgrad,'
-            'current_level,current_session\r\nmy adm code,,,,'
+            'adm_code,alr_date,alr_fname,alr_no,alr_results,clr_code,date_of_birth,'
+            'def_adm,disabled,email,email2,emp2_end,emp2_position,emp2_reason,emp2_start,'
+            'emp_end,emp_position,emp_reason,emp_start,employer,employer2,'
+            'final_clearance_date,finally_cleared_by,financial_clearance_date,'
+            'financially_cleared_by,firstname,flash_notice,former_matric,'
+            'fst_epin,fst_serial_no,fst_sit_date,fst_sit_fname,fst_sit_no,'
+            'fst_sit_results,fst_sit_type,hq2_degree,hq2_disc,hq2_matric_no,'
+            'hq2_school,hq2_session,hq2_type,hq_degree,hq_disc,hq_fname,'
+            'hq_matric_no,hq_school,hq_session,hq_type,is_staff,lastname,'
+            'lga,marit_stat,matric_number,middlename,nationality,next_kin_address,'
+            'next_kin_name,next_kin_phone,next_kin_relation,nin,nysc_lga,'
+            'nysc_location,nysc_year,officer_comment,parents_email,password_updated,'
+            'perm_address,personal_updated,phone,physical_clearance_date,'
+            'provisionally_cleared,reg_number,religion,scd_epin,scd_serial_no,'
+            'scd_sit_date,scd_sit_fname,scd_sit_no,scd_sit_results,scd_sit_type,'
+            'sex,student_id,suspended,suspended_comment,password,state,history,'
+            'certcode,is_postgrad,current_level,current_session\r\nmy adm code,,,,'
             '"[(\'printing_craft_practice\', \'A1\')]",my clr code,1981-02-04#,,,'
-            'anna@sample.com,,,,,,,,,,,,,,,,Anna,,,,,,"[(\'printing_craft_practice\', \'A1\')]"'
-            ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,,,'
-            '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,,,123,,,,,'
+            'anna@sample.com,,,,,,,,,,,,,,,,Anna,,,,,,,,"[(\'printing_craft_practice\', \'A1\')]"'
+            ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,,,,'
+            '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,,,123,,,,,,,'
             '"[(\'printing_craft_practice\', \'A1\')]",,f,A111111,0,,,created,'
             '[u\'2012-11-06 13:16:41 WAT - Record created by system\'],'
Index: main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/utils.py
===================================================================
--- main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/utils.py	(revision 18306)
+++ main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/utils.py	(revision 18307)
@@ -23,4 +23,6 @@
 from kofacustom.nigeria.students.utils import NigeriaStudentsUtils
 from kofacustom.unidel.interfaces import MessageFactory as _
+
+MINIMUM_UNITS_THRESHOLD = 15
 
 def local(student):
@@ -351,28 +353,140 @@
         return d
 
-    def GPABoundaries(self, faccode=None, depcode=None, certcode=None):
-        return ((0.995, 'Fail'),
-               (1.495, 'Pass'),
-               (2.495, '3rd Class'),
-               (3.495, '2nd Class Lower'),
-               (4.495, '2nd Class Upper'),
-               (5, '1st Class'))
+    #def GPABoundaries(self, faccode=None, depcode=None, certcode=None):
+    #    return ((0.995, 'Fail'),
+    #           (1.495, 'Pass'),
+    #           (2.495, '3rd Class'),
+    #           (3.495, '2nd Class Lower'),
+    #           (4.495, '2nd Class Upper'),
+    #           (5, '1st Class'))
+
+    def GPABoundaries(self, faccode=None, depcode=None,
+                            certcode=None, student=None):
+        if student and student.current_mode.startswith('dp'):
+            return ((1.5, 'IRNS / NER / NYV'),
+                    (2.4, 'Pass'),
+                    (3.5, 'Merit'),
+                    (4.5, 'Credit'),
+                    (5, 'Distinction'))
+        elif student:
+            return ((1, 'FRNS / NER / NYV'),
+                    (1.5, 'Pass'),
+                    (2.4, '3rd Class Honours'),
+                    (3.5, '2nd Class Honours Lower Division'),
+                    (4.5, '2nd Class Honours Upper Division'),
+                    (5, '1st Class Honours'))
+        # Session Results Presentations depend on certificate
+        results = None
+        if certcode:
+            cat = queryUtility(ICatalog, name='certificates_catalog')
+            results = list(
+                cat.searchResults(code=(certcode, certcode)))
+        if results and results[0].study_mode.startswith('dp'):
+            return ((1.5, 'IRNS / NER / NYV'),
+                    (2.4, 'Pass'),
+                    (3.5, 'Merit'),
+                    (4.5, 'Credit'),
+                    (5, 'Distinction'))
+        else:
+            return ((1, 'FRNS / NER / NYV'),
+                    (1.5, 'Pass'),
+                    (2.4, '3rd Class Honours'),
+                    (3.5, '2nd Class Honours Lower Division'),
+                    (4.5, '2nd Class Honours Upper Division'),
+                    (5, '1st Class Honours'))
 
     def getClassFromCGPA(self, gpa, student):
-        """Determine the class of degree. In some custom packages
-        this class depends on e.g. the entry session of the student. In the
-        base package, it does not.
+        gpa_boundaries = self.GPABoundaries(student=student)
+
+        try:
+            certificate = getattr(student['studycourse'],'certificate',None)
+            end_level = getattr(certificate, 'end_level', None)
+            final_level = max([studylevel.level for studylevel in student['studycourse'].values()])
+            if end_level and final_level >= end_level:
+                dummy, repeat = divmod(final_level, 100)
+                if gpa <= 5.1 and repeat == 20:
+                    # Irrespective of the CGPA of a student, if the He/She has
+                    # 3rd Extension, such student will be graduated with a "Pass".
+                    return 1, gpa_boundaries[1][1]
+        except ValueError:
+            pass
+        value = decimal.Decimal(str(gpa))
+        gpa = round(value,2)
+        if gpa < gpa_boundaries[0][0]:
+            # FRNS / Fail
+            return 0, gpa_boundaries[0][1]
+        if student.entry_session < 2013 or \
+            student.current_mode.startswith('dp'):
+            if gpa < gpa_boundaries[1][0]:
+                # Pass
+                return 1, gpa_boundaries[1][1]
+        else:
+            if gpa < gpa_boundaries[1][0]:
+                # FRNS
+                # Pass degree has been phased out in 2013 for non-diploma
+                # students
+                return 0, gpa_boundaries[0][1]
+        if gpa < gpa_boundaries[2][0]:
+            # 3rd / Merit
+            return 2, gpa_boundaries[2][1]
+        if gpa < gpa_boundaries[3][0]:
+            # 2nd L / Credit
+            return 3, gpa_boundaries[3][1]
+        if gpa < gpa_boundaries[4][0]:
+            # 2nd U / Distinction
+            return 4, gpa_boundaries[4][1]
+        if gpa <= gpa_boundaries[5][0]:
+            # 1st
+            return 5, gpa_boundaries[5][1]
+        return
+
+    def getDegreeClassNumber(self, level_obj):
+        """Get degree class number (used for SessionResultsPresentation
+        reports).
         """
-        if gpa < self.GPABoundaries()[0][0]:
-            return 0, self.GPABoundaries()[0][1]
-        if gpa < self.GPABoundaries()[1][0]:
-            return 1, self.GPABoundaries()[1][1]
-        if gpa < self.GPABoundaries()[2][0]:
-            return 2, self.GPABoundaries()[2][1]
-        if gpa < self.GPABoundaries()[3][0]:
-            return 3, self.GPABoundaries()[3][1]
-        if gpa < self.GPABoundaries()[4][0]:
-            return 4, self.GPABoundaries()[4][1]
-        if gpa <= self.GPABoundaries()[5][0]:
-            return 5, self.GPABoundaries()[5][1]
-        return
+        certificate = getattr(level_obj.__parent__,'certificate', None)
+        end_level = getattr(certificate, 'end_level', None)
+        if level_obj.level_verdict in ('FRNS', 'NER', 'NYV'):
+            return 0
+        if end_level and level_obj.level >= end_level:
+            if level_obj.level > end_level:
+                # spill-over level
+                if level_obj.gpa_params[1] == 0:
+                    # no credits taken
+                    return 0
+            elif level_obj.gpa_params[1] < MINIMUM_UNITS_THRESHOLD:
+                # credits taken below limit
+                return 0
+            failed_courses = level_obj.passed_params[4]
+            not_taken_courses = level_obj.passed_params[5]
+            if '_m' in failed_courses:
+                return 0
+            if len(not_taken_courses) \
+                and not not_taken_courses == 'Nil':
+                return 0
+        elif level_obj.gpa_params[1] < MINIMUM_UNITS_THRESHOLD:
+            # credits taken below limit
+            return 0
+        # use gpa_boundaries above
+        return self.getClassFromCGPA(
+            level_obj.cumulative_params[0], level_obj.student)[0]
+
+
+    #def getClassFromCGPA(self, gpa, student):
+    #    """Determine the class of degree. In some custom packages
+    #    this class depends on e.g. the entry session of the student. In the
+    #    base package, it does not.
+    #    """
+    #    if gpa < self.GPABoundaries()[0][0]:
+    #        return 0, self.GPABoundaries()[0][1]
+    #    if gpa < self.GPABoundaries()[1][0]:
+    #        return 1, self.GPABoundaries()[1][1]
+    #    if gpa < self.GPABoundaries()[2][0]:
+    #        return 2, self.GPABoundaries()[2][1]
+    #    if gpa < self.GPABoundaries()[3][0]:
+    #        return 3, self.GPABoundaries()[3][1]
+    #    if gpa < self.GPABoundaries()[4][0]:
+    #        return 4, self.GPABoundaries()[4][1]
+    #    if gpa <= self.GPABoundaries()[5][0]:
+    #        return 5, self.GPABoundaries()[5][1]
+    #    return
