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

# Want to get everything from the 'normal' models package.

     2

from django.db.models import *

     3

     4

# The GeoManager

     5

from django.contrib.gis.db.models.manager import GeoManager

     6

     7

# The GeoQ object

     8

from django.contrib.gis.db.models.query import GeoQ

     9

    10

# The geographic-enabled fields.

    11

from django.contrib.gis.db.models.fields import \

    12

     GeometryField, PointField, LineStringField, PolygonField, \

    13

     MultiPointField, MultiLineStringField, MultiPolygonField, \

    14

     GeometryCollectionField

    15

    16

# The geographic mixin class.

    17

from mixin import GeoMixin