Merge pull request #263 from unicef/staging

staging-step2

EquiTrack/EquiTrack/settings/base.py

@@ -66,8 +66,6 @@
 
         {'app': 'locations', 'icon': 'icon-map-marker'},
 
-        #{'app': 'filer', 'label': 'Files', 'icon': 'icon-file'},
-
         {'app': 'tpm', 'label': 'TPM Portal', 'icon': 'icon-calendar'},
     )
 }
@@ -374,7 +372,6 @@
     'mathfilters',
 
     'easy_thumbnails',
-    'filer',
     'storages',
     'rest_framework',
     'rest_framework_swagger',

EquiTrack/EquiTrack/settings/local.py

@@ -10,9 +10,9 @@
 INTERNAL_IPS = ('127.0.0.1',)
 
 # See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation
-# MIDDLEWARE_CLASSES += (
-#     'debug_toolbar.middleware.DebugToolbarMiddleware',
-# )
+MIDDLEWARE_CLASSES += (
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+)
 
 # See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation
 DEBUG_TOOLBAR_CONFIG = {

EquiTrack/EquiTrack/settings/local_base.py

@@ -7,7 +7,6 @@
 ########## DEBUG CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#debug
 DEBUG = True
-FILER_DEBUG = DEBUG
 
 ALLOWED_HOSTS = ['127.0.0.1']
 

EquiTrack/EquiTrack/settings/production.py

@@ -50,21 +50,6 @@
     # MEDIA_URL = 'https://{}.blob.core.windows.net/{}/'.format(
     #     AZURE_ACCOUNT_NAME, AZURE_CONTAINER
     # )
-    FILER_IS_PUBLIC_DEFAULT = False
-    FILER_STORAGES = {
-        'public': {
-            'main': {
-                'ENGINE': 'storages.backends.azure_storage.AzureStorage',
-                'UPLOAD_TO': 'partners.utils.by_pca',
-            },
-        },
-        'private': {
-            'main': {
-                'ENGINE': 'storages.backends.azure_storage.AzureStorage',
-                'UPLOAD_TO': 'partners.utils.by_pca',
-            },
-        },
-    }
 
     from storages.backends.azure_storage import AzureStorage
     storage = AzureStorage()
@@ -218,4 +203,13 @@
 
     'JWT_AUTH_HEADER_PREFIX': 'JWT',
 }
-######## END JWT AUTH CONFIGURATION
+######## END JWT AUTH CONFIGURATION
+
+########## CACHE CONFIGURATION
+CACHES = {
+    'default': {
+        'BACKEND': 'redis_cache.RedisCache',
+        'LOCATION': environ.get('REDIS_URL', 'redis://localhost:6379/0')
+    }
+}
+########## END CACHE CONFIGURATION

EquiTrack/EquiTrack/urls.py

@@ -9,6 +9,8 @@
 # import every app/autocomplete_light_registry.py
 autocomplete_light.autodiscover()
 
+from rest_framework_swagger.views import get_swagger_view
+
 from rest_framework_nested import routers
 
 # Uncomment the next two lines to enable the admin:
@@ -71,6 +73,8 @@
     LabelViewSet,
 )
 
+schema_view = get_swagger_view(title='eTools API')
+
 api = routers.SimpleRouter()
 
 trips_api = routers.SimpleRouter()
@@ -147,7 +151,7 @@
     url(r'^api/', include(trips_api.urls)),
     url(r'^api/', include(tripsfiles_api.urls)),
     url(r'^api/', include(actionpoint_api.urls)),
-    url(r'^api/docs/', include('rest_framework_swagger.urls')),
+    url(r'^api/docs/', schema_view),
 
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),

EquiTrack/activityinfo/models.py

@@ -8,6 +8,11 @@
 
 
 class Database(models.Model):
+    """
+    Represents ActivityInfo database client.
+    
+    Can import database data and reports data from ActivityInfoClient.
+    """
 
     ai_id = models.PositiveIntegerField(
         unique=True,
@@ -157,6 +162,9 @@ def import_reports(self):
 
 
 class Partner(models.Model):
+    """
+    Represents Partner in ActivityInfo database client.
+    """
 
     ai_id = models.PositiveIntegerField(unique=True)
     database = models.ForeignKey(Database)
@@ -171,6 +179,9 @@ def __unicode__(self):
 
 
 class Activity(models.Model):
+    """
+    Represents Activity in ActivityInfo database client.
+    """
 
     ai_id = models.PositiveIntegerField(unique=True)
     database = models.ForeignKey(Database)
@@ -185,6 +196,9 @@ class Meta:
 
 
 class Indicator(models.Model):
+    """
+    Represents Indicator in ActivityInfo database client.
+    """
 
     ai_id = models.PositiveIntegerField(unique=True)
     activity = models.ForeignKey(Activity)
@@ -197,6 +211,9 @@ def __unicode__(self):
 
 
 class AttributeGroup(models.Model):
+    """
+    Represents AttributeGroup in ActivityInfo database client.
+    """
 
     activity = models.ForeignKey(Activity)
     ai_id = models.PositiveIntegerField(unique=True)
@@ -209,6 +226,9 @@ def __unicode__(self):
 
 
 class Attribute(models.Model):
+    """
+    Represents Attribute in ActivityInfo database client.
+    """
 
     attribute_group = models.ForeignKey(AttributeGroup)
     ai_id = models.PositiveIntegerField(unique=True)

EquiTrack/funds/models.py

@@ -4,6 +4,10 @@
 
 
 class Donor(models.Model):
+    """
+    Represents Donor for a Grant.
+    """
+
     name = models.CharField(max_length=45L, unique=True)
 
     class Meta:
@@ -13,17 +17,16 @@ def __unicode__(self):
         return self.name
 
 
-class GrantManager(models.Manager):
-
-    def get_queryset(self):
-        return super(GrantManager, self).get_queryset().select_related('donor')
-
-
 class GrantManager(models.Manager):
     def get_queryset(self):
         return super(GrantManager, self).get_queryset().select_related('donor')
 
 class Grant(models.Model):
+    """
+    Represents the name of a Grant with expiration date, and Donor name.
+
+    Relates to :model:`funds.Donor`
+    """
 
     donor = models.ForeignKey(Donor)
     name = models.CharField(max_length=128L, unique=True)

EquiTrack/locations/models.py

@@ -25,6 +25,10 @@ def get_random_color():
 
 
 class GatewayType(models.Model):
+    """
+    Represents an Admin Type in location-related models.
+    """
+
     name = models.CharField(max_length=64L, unique=True)
 
     class Meta:
@@ -36,6 +40,12 @@ def __unicode__(self):
 
 
 class Governorate(models.Model):
+    """
+    Represents Admin level as a geospatial boundary
+
+    Relates to :model:`locations.GatewayType`
+    """
+
     name = models.CharField(max_length=45L)
     p_code = models.CharField(max_length=32L, blank=True, null=True)
     gateway = models.ForeignKey(
@@ -56,6 +66,13 @@ class Meta:
 
 
 class Region(models.Model):
+    """
+    Represents a district, a part of Admin area as a geospatial boundary
+
+    Relates to :model:`locations.GatewayType`
+    Relates to :model:`locations.Governorate`
+    """
+
     governorate = models.ForeignKey(Governorate)
     name = models.CharField(max_length=45L)
     p_code = models.CharField(max_length=32L, blank=True, null=True)
@@ -78,6 +95,13 @@ class Meta:
 
 
 class Locality(models.Model):
+    """
+    Represents Locality, a part of District area as a geospatial boundary
+
+    Relates to :model:`locations.GatewayType`
+    Relates to :model:`locations.Region`
+    """
+
     region = models.ForeignKey(Region)
     cad_code = models.CharField(max_length=11L)
     cas_code = models.CharField(max_length=11L)
@@ -111,6 +135,13 @@ def get_queryset(self):
 
 
 class Location(MPTTModel):
+    """
+    Represents Location, either a point or geospatial ojject,
+    pcode should be unique
+
+    Relates to :model:`locations.GatewayType`
+    Relates to :model:`locations.Locality`
+    """
 
     name = models.CharField(max_length=254L)
     locality = models.ForeignKey(Locality, null=True, blank=True)
@@ -166,7 +197,12 @@ def invalidate_locations_etag(sender, instance, **kwargs):
 
 class LinkedLocation(models.Model):
     """
-    Generic model for linking locations to anything
+    Represents Generic model for linking locations to anything
+
+    Relates to :model:`locations.Governorate`
+    Relates to :model:`locations.Region`
+    Relates to :model:`locations.Locality`
+    Relates to :model:`locations.Location`
     """
     governorate = models.ForeignKey(Governorate)
     region = ChainedForeignKey(
@@ -217,6 +253,11 @@ def __unicode__(self):
 
 
 class CartoDBTable(MPTTModel):
+    """
+    Represents a table in CartoDB, it is used to import lacations
+
+    Relates to :model:`locations.GatewayType`
+    """
 
     domain = models.CharField(max_length=254)
     api_key = models.CharField(max_length=254)

EquiTrack/locations/serializers.py

@@ -27,7 +27,7 @@ class GatewayTypeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = GatewayType
-
+        fields = '__all__'
 
 class LocationSerializer(serializers.ModelSerializer):