Redone the acceptedStudentsExport functionality. The method has been renamed to exportStudentsWithProjects and retrieves the document_name and the new shipping address properties. Also it filters out all invalid projects or projects for wich the scope_path doesn't match the given scope_pa th_start. Also there is no more need to use the argument given to this method when adding the extra columns. The data is now prepared by one loop which uses the key present in the accepted_students dictionary for retrieving the data used by the extra columns.

     1

from django.db.backends import BaseDatabaseClient

     2

from django.conf import settings

     3

import os

     4

     5

class DatabaseClient(BaseDatabaseClient):

     6

    executable_name = 'sqlplus'

     7

     8

    def runshell(self):

     9

        dsn = settings.DATABASE_USER

    10

        if settings.DATABASE_PASSWORD:

    11

            dsn += "/%s" % settings.DATABASE_PASSWORD

    12

        if settings.DATABASE_NAME:

    13

            dsn += "@%s" % settings.DATABASE_NAME

    14

        args = [self.executable_name, "-L", dsn]

    15

        os.execvp(self.executable_name, args)