From 7d0943c792dffb13f76861e2b131630647724d7b Mon Sep 17 00:00:00 2001 From: ntrncic Date: Thu, 10 Nov 2016 08:23:14 -0500 Subject: [PATCH] reset migrations --- EquiTrack/funds/migrations/0001_initial.py | 20 +- .../funds/migrations/0002_grant_expiry.py | 19 - .../migrations/0003_grant_description.py | 19 - .../migrations/0004_auto_20160909_2258.py | 18 - .../migrations/0005_auto_20160910_0836.py | 18 - .../locations/migrations/0001_initial.py | 130 ++-- .../migrations/0002_auto_20151211_1528.py | 84 --- .../migrations/0003_auto_20151216_1339.py | 19 - .../migrations/0004_auto_20160222_1652.py | 22 - .../migrations/0005_auto_20160226_1543.py | 19 - .../migrations/0006_auto_20160229_1545.py | 18 - .../migrations/0007_auto_20161027_2022.py | 22 - EquiTrack/partners/migrations/0001_initial.py | 563 ++++++++++-------- .../migrations/0002_auto_20151009_2046.py | 32 - .../migrations/0003_auto_20151012_1321.py | 57 -- .../migrations/0004_auto_20151014_0817.py | 32 - .../migrations/0005_auto_20151014_1955.py | 50 -- .../migrations/0006_auto_20151015_1202.py | 32 - .../migrations/0007_auto_20151018_2024.py | 45 -- .../migrations/0008_auto_20151018_2238.py | 26 - .../migrations/0009_auto_20151022_1216.py | 20 - .../migrations/0010_auto_20151027_1852.py | 20 - .../migrations/0011_auto_20151102_2052.py | 26 - .../migrations/0012_auto_20151109_1503.py | 20 - .../migrations/0013_auto_20151118_1151.py | 34 -- .../migrations/0014_auto_20151119_1310.py | 26 - .../migrations/0015_auto_20151120_1817.py | 38 -- .../migrations/0016_auto_20151126_1702.py | 26 - .../migrations/0017_auto_20151203_1758.py | 20 - .../migrations/0018_auto_20151211_1528.py | 19 - .../migrations/0019_auto_20160113_1554.py | 39 -- .../migrations/0020_auto_20160127_1751.py | 34 -- .../0021_partnerstaffmember_active.py | 19 - .../migrations/0022_auto_20160223_2222.py | 45 -- .../migrations/0023_auto_20160228_0002.py | 77 --- .../migrations/0024_indicatorreport.py | 42 -- .../migrations/0025_auto_20160229_1333.py | 19 - .../migrations/0026_auto_20160229_1545.py | 34 -- .../0027_resultchain_current_progress.py | 20 - .../migrations/0028_auto_20160304_1840.py | 43 -- .../migrations/0029_auto_20160308_0142.py | 19 - .../migrations/0030_auto_20160313_0006.py | 19 - .../migrations/0031_auto_20160313_1241.py | 19 - .../migrations/0032_pca_project_type.py | 19 - .../migrations/0033_auto_20160313_2153.py | 19 - .../partners/migrations/0034_ramindicator.py | 25 - .../migrations/0035_auto_20160314_1524.py | 24 - .../migrations/0036_auto_20160328_0122.py | 41 -- .../migrations/0037_auto_20160329_0220.py | 35 -- .../migrations/0038_auto_20160404_1519.py | 30 - .../0039_distributionplan_document.py | 20 - .../migrations/0040_auto_20160411_1404.py | 35 -- .../migrations/0041_auto_20160413_0051.py | 23 - .../migrations/0042_auto_20160413_1321.py | 19 - .../migrations/0043_auto_20160413_1358.py | 19 - .../migrations/0044_pca_planned_visits.py | 19 - .../migrations/0045_remove_pcafile_file.py | 18 - .../migrations/0046_auto_20160426_1521.py | 111 ---- .../migrations/0047_auto_20160427_2035.py | 24 - .../migrations/0048_indicatorduedates.py | 23 - .../migrations/0049_auto_20160428_0213.py | 33 - ...0050_partnerorganization_shared_partner.py | 19 - .../migrations/0051_auto_20160505_1740.py | 19 - .../0052_convert_disaggregation_to_json.py | 42 -- .../migrations/0053_auto_20160505_1810.py | 25 - .../partners/migrations/0054_bankdetails.py | 27 - .../migrations/0055_auto_20160509_0934.py | 24 - .../migrations/0056_auto_20160509_1330.py | 24 - .../migrations/0057_auto_20160509_1827.py | 22 - ...nmentinterventionresult_activities_list.py | 20 - .../migrations/0059_auto_20160621_2228.py | 32 - .../migrations/0060_auto_20160721_2313.py | 19 - .../0061_partnerorganization_hidden.py | 19 - .../migrations/0062_auto_20160817_1742.py | 29 - .../migrations/0063_auto_20160817_2202.py | 24 - .../migrations/0064_auto_20160817_2233.py | 34 -- .../migrations/0065_auto_20160826_2024.py | 22 - .../migrations/0066_auto_20160826_2026.py | 24 - .../migrations/0067_auto_20160910_0836.py | 24 - ...8_remove_fundingcommitment_intervention.py | 18 - .../migrations/0069_auto_20160915_2222.py | 25 - .../migrations/0070_auto_20160915_2340.py | 20 - .../migrations/0071_auto_20160917_0142.py | 19 - .../0072_partnerorganization_hact_values.py | 20 - ...rnmentinterventionresult_planned_visits.py | 19 - .../migrations/0074_auto_20161027_2022.py | 36 -- EquiTrack/reports/migrations/0001_initial.py | 241 +++----- .../migrations/0002_auto_20151012_1321.py | 146 ----- .../migrations/0003_auto_20151014_0817.py | 20 - .../migrations/0004_auto_20151015_1202.py | 32 - .../migrations/0005_auto_20151015_1930.py | 20 - .../migrations/0006_auto_20151015_1934.py | 20 - .../migrations/0007_auto_20151124_1245.py | 26 - .../migrations/0008_auto_20151124_1417.py | 20 - .../migrations/0009_auto_20151126_1702.py | 19 - .../migrations/0010_auto_20160202_1756.py | 19 - .../migrations/0011_auto_20160207_2248.py | 24 - .../migrations/0012_auto_20160222_1652.py | 22 - .../migrations/0013_auto_20160226_1543.py | 19 - .../migrations/0014_auto_20160314_0319.py | 39 -- .../reports/migrations/0015_result_ram.py | 19 - .../migrations/0016_auto_20160323_1933.py | 23 - .../migrations/0017_auto_20160428_1033.py | 19 - .../migrations/0018_auto_20160811_1654.py | 19 - .../migrations/0019_auto_20160825_1857.py | 66 -- .../migrations/0020_indicator_assumptions.py | 19 - .../migrations/0021_auto_20160906_1925.py | 48 -- .../migrations/0022_auto_20160906_1927.py | 26 - .../migrations/0023_auto_20160909_2203.py | 19 - .../migrations/0024_auto_20160915_2222.py | 30 - .../migrations/0024_auto_20161005_2137.py | 16 - EquiTrack/reports/migrations/0025_merge.py | 15 - .../migrations/0026_auto_20161013_2034.py | 42 -- EquiTrack/tpm/migrations/0001_initial.py | 2 +- EquiTrack/trips/migrations/0001_initial.py | 178 ++++-- .../migrations/0002_auto_20151004_2225.py | 123 ---- .../migrations/0003_auto_20151009_2046.py | 20 - .../migrations/0004_auto_20151012_1321.py | 20 - .../migrations/0005_auto_20151014_1955.py | 26 - .../migrations/0006_fileattachment_caption.py | 20 - .../migrations/0007_auto_20151027_1852.py | 20 - .../migrations/0008_auto_20151102_2052.py | 34 -- .../migrations/0009_auto_20151118_1151.py | 56 -- .../migrations/0010_auto_20160113_2233.py | 34 -- .../trips/migrations/0011_linkedpartner.py | 26 - .../migrations/0012_auto_20160425_1243.py | 24 - .../migrations/0013_auto_20160428_1249.py | 24 - .../migrations/0014_auto_20160510_1432.py | 34 -- .../migrations/0015_auto_20160526_1916.py | 20 - .../migrations/0016_auto_20160607_2237.py | 23 - .../0017_linkedgovernmentpartner.py | 30 - .../migrations/0018_linkedpartner_result.py | 21 - EquiTrack/users/migrations/0001_initial.py | 68 ++- .../0002_userprofile_country_override.py | 20 - .../users/migrations/0003_country_override.py | 29 - .../0004_userprofile_partner_staff_member.py | 19 - .../0005_country_buisness_area_code.py | 19 - .../migrations/0006_auto_20160204_1237.py | 19 - .../migrations/0007_auto_20160205_2230.py | 19 - .../0008_userprofile_countries_available.py | 19 - .../migrations/0009_countries_available.py | 40 -- .../migrations/0010_auto_20160216_1814.py | 29 - .../migrations/0011_auto_20160313_1241.py | 24 - .../0012_country_vision_last_synced.py | 19 - .../migrations/0013_auto_20160509_2148.py | 24 - .../migrations/0014_auto_20160816_2228.py | 26 - EquiTrack/users/migrations/__init__.py | 1 - EquiTrack/vision/migrations/0001_initial.py | 12 +- EquiTrack/workplan/migrations/0001_initial.py | 78 +-- .../migrations/0002_auto_20161027_2038.py | 21 - 150 files changed, 698 insertions(+), 4617 deletions(-) delete mode 100644 EquiTrack/funds/migrations/0002_grant_expiry.py delete mode 100644 EquiTrack/funds/migrations/0003_grant_description.py delete mode 100644 EquiTrack/funds/migrations/0004_auto_20160909_2258.py delete mode 100644 EquiTrack/funds/migrations/0005_auto_20160910_0836.py delete mode 100644 EquiTrack/locations/migrations/0002_auto_20151211_1528.py delete mode 100644 EquiTrack/locations/migrations/0003_auto_20151216_1339.py delete mode 100644 EquiTrack/locations/migrations/0004_auto_20160222_1652.py delete mode 100644 EquiTrack/locations/migrations/0005_auto_20160226_1543.py delete mode 100644 EquiTrack/locations/migrations/0006_auto_20160229_1545.py delete mode 100644 EquiTrack/locations/migrations/0007_auto_20161027_2022.py delete mode 100644 EquiTrack/partners/migrations/0002_auto_20151009_2046.py delete mode 100644 EquiTrack/partners/migrations/0003_auto_20151012_1321.py delete mode 100644 EquiTrack/partners/migrations/0004_auto_20151014_0817.py delete mode 100644 EquiTrack/partners/migrations/0005_auto_20151014_1955.py delete mode 100644 EquiTrack/partners/migrations/0006_auto_20151015_1202.py delete mode 100644 EquiTrack/partners/migrations/0007_auto_20151018_2024.py delete mode 100644 EquiTrack/partners/migrations/0008_auto_20151018_2238.py delete mode 100644 EquiTrack/partners/migrations/0009_auto_20151022_1216.py delete mode 100644 EquiTrack/partners/migrations/0010_auto_20151027_1852.py delete mode 100644 EquiTrack/partners/migrations/0011_auto_20151102_2052.py delete mode 100644 EquiTrack/partners/migrations/0012_auto_20151109_1503.py delete mode 100644 EquiTrack/partners/migrations/0013_auto_20151118_1151.py delete mode 100644 EquiTrack/partners/migrations/0014_auto_20151119_1310.py delete mode 100644 EquiTrack/partners/migrations/0015_auto_20151120_1817.py delete mode 100644 EquiTrack/partners/migrations/0016_auto_20151126_1702.py delete mode 100644 EquiTrack/partners/migrations/0017_auto_20151203_1758.py delete mode 100644 EquiTrack/partners/migrations/0018_auto_20151211_1528.py delete mode 100644 EquiTrack/partners/migrations/0019_auto_20160113_1554.py delete mode 100644 EquiTrack/partners/migrations/0020_auto_20160127_1751.py delete mode 100644 EquiTrack/partners/migrations/0021_partnerstaffmember_active.py delete mode 100644 EquiTrack/partners/migrations/0022_auto_20160223_2222.py delete mode 100644 EquiTrack/partners/migrations/0023_auto_20160228_0002.py delete mode 100644 EquiTrack/partners/migrations/0024_indicatorreport.py delete mode 100644 EquiTrack/partners/migrations/0025_auto_20160229_1333.py delete mode 100644 EquiTrack/partners/migrations/0026_auto_20160229_1545.py delete mode 100644 EquiTrack/partners/migrations/0027_resultchain_current_progress.py delete mode 100644 EquiTrack/partners/migrations/0028_auto_20160304_1840.py delete mode 100644 EquiTrack/partners/migrations/0029_auto_20160308_0142.py delete mode 100644 EquiTrack/partners/migrations/0030_auto_20160313_0006.py delete mode 100644 EquiTrack/partners/migrations/0031_auto_20160313_1241.py delete mode 100644 EquiTrack/partners/migrations/0032_pca_project_type.py delete mode 100644 EquiTrack/partners/migrations/0033_auto_20160313_2153.py delete mode 100644 EquiTrack/partners/migrations/0034_ramindicator.py delete mode 100644 EquiTrack/partners/migrations/0035_auto_20160314_1524.py delete mode 100644 EquiTrack/partners/migrations/0036_auto_20160328_0122.py delete mode 100644 EquiTrack/partners/migrations/0037_auto_20160329_0220.py delete mode 100644 EquiTrack/partners/migrations/0038_auto_20160404_1519.py delete mode 100644 EquiTrack/partners/migrations/0039_distributionplan_document.py delete mode 100644 EquiTrack/partners/migrations/0040_auto_20160411_1404.py delete mode 100644 EquiTrack/partners/migrations/0041_auto_20160413_0051.py delete mode 100644 EquiTrack/partners/migrations/0042_auto_20160413_1321.py delete mode 100644 EquiTrack/partners/migrations/0043_auto_20160413_1358.py delete mode 100644 EquiTrack/partners/migrations/0044_pca_planned_visits.py delete mode 100644 EquiTrack/partners/migrations/0045_remove_pcafile_file.py delete mode 100644 EquiTrack/partners/migrations/0046_auto_20160426_1521.py delete mode 100644 EquiTrack/partners/migrations/0047_auto_20160427_2035.py delete mode 100644 EquiTrack/partners/migrations/0048_indicatorduedates.py delete mode 100644 EquiTrack/partners/migrations/0049_auto_20160428_0213.py delete mode 100644 EquiTrack/partners/migrations/0050_partnerorganization_shared_partner.py delete mode 100644 EquiTrack/partners/migrations/0051_auto_20160505_1740.py delete mode 100644 EquiTrack/partners/migrations/0052_convert_disaggregation_to_json.py delete mode 100644 EquiTrack/partners/migrations/0053_auto_20160505_1810.py delete mode 100644 EquiTrack/partners/migrations/0054_bankdetails.py delete mode 100644 EquiTrack/partners/migrations/0055_auto_20160509_0934.py delete mode 100644 EquiTrack/partners/migrations/0056_auto_20160509_1330.py delete mode 100644 EquiTrack/partners/migrations/0057_auto_20160509_1827.py delete mode 100644 EquiTrack/partners/migrations/0058_governmentinterventionresult_activities_list.py delete mode 100644 EquiTrack/partners/migrations/0059_auto_20160621_2228.py delete mode 100644 EquiTrack/partners/migrations/0060_auto_20160721_2313.py delete mode 100644 EquiTrack/partners/migrations/0061_partnerorganization_hidden.py delete mode 100644 EquiTrack/partners/migrations/0062_auto_20160817_1742.py delete mode 100644 EquiTrack/partners/migrations/0063_auto_20160817_2202.py delete mode 100644 EquiTrack/partners/migrations/0064_auto_20160817_2233.py delete mode 100644 EquiTrack/partners/migrations/0065_auto_20160826_2024.py delete mode 100644 EquiTrack/partners/migrations/0066_auto_20160826_2026.py delete mode 100644 EquiTrack/partners/migrations/0067_auto_20160910_0836.py delete mode 100644 EquiTrack/partners/migrations/0068_remove_fundingcommitment_intervention.py delete mode 100644 EquiTrack/partners/migrations/0069_auto_20160915_2222.py delete mode 100644 EquiTrack/partners/migrations/0070_auto_20160915_2340.py delete mode 100644 EquiTrack/partners/migrations/0071_auto_20160917_0142.py delete mode 100644 EquiTrack/partners/migrations/0072_partnerorganization_hact_values.py delete mode 100644 EquiTrack/partners/migrations/0073_governmentinterventionresult_planned_visits.py delete mode 100644 EquiTrack/partners/migrations/0074_auto_20161027_2022.py delete mode 100644 EquiTrack/reports/migrations/0002_auto_20151012_1321.py delete mode 100644 EquiTrack/reports/migrations/0003_auto_20151014_0817.py delete mode 100644 EquiTrack/reports/migrations/0004_auto_20151015_1202.py delete mode 100644 EquiTrack/reports/migrations/0005_auto_20151015_1930.py delete mode 100644 EquiTrack/reports/migrations/0006_auto_20151015_1934.py delete mode 100644 EquiTrack/reports/migrations/0007_auto_20151124_1245.py delete mode 100644 EquiTrack/reports/migrations/0008_auto_20151124_1417.py delete mode 100644 EquiTrack/reports/migrations/0009_auto_20151126_1702.py delete mode 100644 EquiTrack/reports/migrations/0010_auto_20160202_1756.py delete mode 100644 EquiTrack/reports/migrations/0011_auto_20160207_2248.py delete mode 100644 EquiTrack/reports/migrations/0012_auto_20160222_1652.py delete mode 100644 EquiTrack/reports/migrations/0013_auto_20160226_1543.py delete mode 100644 EquiTrack/reports/migrations/0014_auto_20160314_0319.py delete mode 100644 EquiTrack/reports/migrations/0015_result_ram.py delete mode 100644 EquiTrack/reports/migrations/0016_auto_20160323_1933.py delete mode 100644 EquiTrack/reports/migrations/0017_auto_20160428_1033.py delete mode 100644 EquiTrack/reports/migrations/0018_auto_20160811_1654.py delete mode 100644 EquiTrack/reports/migrations/0019_auto_20160825_1857.py delete mode 100644 EquiTrack/reports/migrations/0020_indicator_assumptions.py delete mode 100644 EquiTrack/reports/migrations/0021_auto_20160906_1925.py delete mode 100644 EquiTrack/reports/migrations/0022_auto_20160906_1927.py delete mode 100644 EquiTrack/reports/migrations/0023_auto_20160909_2203.py delete mode 100644 EquiTrack/reports/migrations/0024_auto_20160915_2222.py delete mode 100644 EquiTrack/reports/migrations/0024_auto_20161005_2137.py delete mode 100644 EquiTrack/reports/migrations/0025_merge.py delete mode 100644 EquiTrack/reports/migrations/0026_auto_20161013_2034.py delete mode 100644 EquiTrack/trips/migrations/0002_auto_20151004_2225.py delete mode 100644 EquiTrack/trips/migrations/0003_auto_20151009_2046.py delete mode 100644 EquiTrack/trips/migrations/0004_auto_20151012_1321.py delete mode 100644 EquiTrack/trips/migrations/0005_auto_20151014_1955.py delete mode 100644 EquiTrack/trips/migrations/0006_fileattachment_caption.py delete mode 100644 EquiTrack/trips/migrations/0007_auto_20151027_1852.py delete mode 100644 EquiTrack/trips/migrations/0008_auto_20151102_2052.py delete mode 100644 EquiTrack/trips/migrations/0009_auto_20151118_1151.py delete mode 100644 EquiTrack/trips/migrations/0010_auto_20160113_2233.py delete mode 100644 EquiTrack/trips/migrations/0011_linkedpartner.py delete mode 100644 EquiTrack/trips/migrations/0012_auto_20160425_1243.py delete mode 100644 EquiTrack/trips/migrations/0013_auto_20160428_1249.py delete mode 100644 EquiTrack/trips/migrations/0014_auto_20160510_1432.py delete mode 100644 EquiTrack/trips/migrations/0015_auto_20160526_1916.py delete mode 100644 EquiTrack/trips/migrations/0016_auto_20160607_2237.py delete mode 100644 EquiTrack/trips/migrations/0017_linkedgovernmentpartner.py delete mode 100644 EquiTrack/trips/migrations/0018_linkedpartner_result.py delete mode 100644 EquiTrack/users/migrations/0002_userprofile_country_override.py delete mode 100644 EquiTrack/users/migrations/0003_country_override.py delete mode 100644 EquiTrack/users/migrations/0004_userprofile_partner_staff_member.py delete mode 100644 EquiTrack/users/migrations/0005_country_buisness_area_code.py delete mode 100644 EquiTrack/users/migrations/0006_auto_20160204_1237.py delete mode 100644 EquiTrack/users/migrations/0007_auto_20160205_2230.py delete mode 100644 EquiTrack/users/migrations/0008_userprofile_countries_available.py delete mode 100644 EquiTrack/users/migrations/0009_countries_available.py delete mode 100644 EquiTrack/users/migrations/0010_auto_20160216_1814.py delete mode 100644 EquiTrack/users/migrations/0011_auto_20160313_1241.py delete mode 100644 EquiTrack/users/migrations/0012_country_vision_last_synced.py delete mode 100644 EquiTrack/users/migrations/0013_auto_20160509_2148.py delete mode 100644 EquiTrack/users/migrations/0014_auto_20160816_2228.py delete mode 100644 EquiTrack/workplan/migrations/0002_auto_20161027_2038.py diff --git a/EquiTrack/funds/migrations/0001_initial.py b/EquiTrack/funds/migrations/0001_initial.py index 6139d4ef04..11ffbbabe1 100644 --- a/EquiTrack/funds/migrations/0001_initial.py +++ b/EquiTrack/funds/migrations/0001_initial.py @@ -1,11 +1,15 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-09 22:21 from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): + initial = True + dependencies = [ ] @@ -13,24 +17,24 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Donor', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=45L)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=45L, unique=True)), ], options={ 'ordering': ['name'], }, - bases=(models.Model,), ), migrations.CreateModel( name='Grant', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=128L)), - ('donor', models.ForeignKey(to='funds.Donor')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128L, unique=True)), + ('description', models.CharField(blank=True, max_length=255, null=True)), + ('expiry', models.DateField(blank=True, null=True)), + ('donor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.Donor')), ], options={ 'ordering': ['donor'], }, - bases=(models.Model,), ), ] diff --git a/EquiTrack/funds/migrations/0002_grant_expiry.py b/EquiTrack/funds/migrations/0002_grant_expiry.py deleted file mode 100644 index 8f1f112fbd..0000000000 --- a/EquiTrack/funds/migrations/0002_grant_expiry.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('funds', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='grant', - name='expiry', - field=models.DateField(null=True, blank=True), - ), - ] diff --git a/EquiTrack/funds/migrations/0003_grant_description.py b/EquiTrack/funds/migrations/0003_grant_description.py deleted file mode 100644 index d69e097f1d..0000000000 --- a/EquiTrack/funds/migrations/0003_grant_description.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('funds', '0002_grant_expiry'), - ] - - operations = [ - migrations.AddField( - model_name='grant', - name='description', - field=models.CharField(max_length=255, null=True, blank=True), - ), - ] diff --git a/EquiTrack/funds/migrations/0004_auto_20160909_2258.py b/EquiTrack/funds/migrations/0004_auto_20160909_2258.py deleted file mode 100644 index b501802852..0000000000 --- a/EquiTrack/funds/migrations/0004_auto_20160909_2258.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('funds', '0003_grant_description'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='grant', - unique_together=set([('donor', 'name')]), - ), - ] diff --git a/EquiTrack/funds/migrations/0005_auto_20160910_0836.py b/EquiTrack/funds/migrations/0005_auto_20160910_0836.py deleted file mode 100644 index 1da59e44d2..0000000000 --- a/EquiTrack/funds/migrations/0005_auto_20160910_0836.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('funds', '0004_auto_20160909_2258'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='grant', - unique_together=set([]), - ), - ] diff --git a/EquiTrack/locations/migrations/0001_initial.py b/EquiTrack/locations/migrations/0001_initial.py index 0c744552ea..2396b9e663 100644 --- a/EquiTrack/locations/migrations/0001_initial.py +++ b/EquiTrack/locations/migrations/0001_initial.py @@ -1,161 +1,173 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-09 22:21 from __future__ import unicode_literals -from django.db import models, migrations -import smart_selects.db_fields -import paintstore.fields import django.contrib.gis.db.models.fields +from django.db import migrations, models +import django.db.models.deletion +import django.db.models.manager import locations.models +import mptt.fields +import paintstore.fields +import smart_selects.db_fields class Migration(migrations.Migration): + initial = True + dependencies = [ - ('contenttypes', '0001_initial'), + ('contenttypes', '0002_remove_content_type_name'), ] operations = [ migrations.CreateModel( name='CartoDBTable', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('domain', models.CharField(max_length=254)), ('api_key', models.CharField(max_length=254)), ('table_name', models.CharField(max_length=254)), - ('display_name', models.CharField(max_length=254, null=True, blank=True)), + ('display_name', models.CharField(blank=True, max_length=254, null=True)), ('name_col', models.CharField(default=b'name', max_length=254)), ('pcode_col', models.CharField(default=b'pcode', max_length=254)), - ('parent_code_col', models.CharField(max_length=254, null=True, blank=True)), - ('color', paintstore.fields.ColorPickerField(default=locations.models.get_random_color, max_length=7, null=True, blank=True)), + ('parent_code_col', models.CharField(blank=True, max_length=254, null=True)), + ('color', paintstore.fields.ColorPickerField(blank=True, default=locations.models.get_random_color, max_length=7, null=True)), + ('lft', models.PositiveIntegerField(db_index=True, editable=False)), + ('rght', models.PositiveIntegerField(db_index=True, editable=False)), + ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), + ('level', models.PositiveIntegerField(db_index=True, editable=False)), ], options={ + 'abstract': False, }, - bases=(models.Model,), + managers=[ + ('_default_manager', django.db.models.manager.Manager()), + ], ), migrations.CreateModel( name='GatewayType', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=64L)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64L, unique=True)), ], options={ 'ordering': ['name'], + 'verbose_name': 'Location Type', }, - bases=(models.Model,), ), migrations.CreateModel( name='Governorate', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=45L)), - ('p_code', models.CharField(max_length=32L, null=True, blank=True)), - ('color', paintstore.fields.ColorPickerField(default=locations.models.get_random_color, max_length=7, null=True, blank=True)), - ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, null=True, blank=True)), - ('gateway', models.ForeignKey(verbose_name=b'Admin type', blank=True, to='locations.GatewayType', null=True)), + ('p_code', models.CharField(blank=True, max_length=32L, null=True)), + ('color', paintstore.fields.ColorPickerField(blank=True, default=locations.models.get_random_color, max_length=7, null=True)), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)), + ('gateway', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.GatewayType', verbose_name=b'Admin type')), ], options={ 'ordering': ['name'], }, - bases=(models.Model,), ), migrations.CreateModel( name='LinkedLocation', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('object_id', models.PositiveIntegerField()), - ('content_type', models.ForeignKey(to='contenttypes.ContentType')), - ('governorate', models.ForeignKey(to='locations.Governorate')), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ('governorate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='locations.Governorate')), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='Locality', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('cad_code', models.CharField(max_length=11L)), ('cas_code', models.CharField(max_length=11L)), ('cas_code_un', models.CharField(max_length=11L)), ('name', models.CharField(max_length=128L)), ('cas_village_name', models.CharField(max_length=128L)), - ('p_code', models.CharField(max_length=32L, null=True, blank=True)), - ('color', paintstore.fields.ColorPickerField(default=locations.models.get_random_color, max_length=7, null=True, blank=True)), - ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, null=True, blank=True)), - ('gateway', models.ForeignKey(verbose_name=b'Admin type', blank=True, to='locations.GatewayType', null=True)), + ('p_code', models.CharField(blank=True, max_length=32L, null=True)), + ('color', paintstore.fields.ColorPickerField(blank=True, default=locations.models.get_random_color, max_length=7, null=True)), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)), + ('gateway', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.GatewayType', verbose_name=b'Admin type')), ], options={ 'ordering': ['name'], 'verbose_name': 'Sub-district', }, - bases=(models.Model,), ), migrations.CreateModel( name='Location', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=254L)), - ('latitude', models.FloatField(null=True, blank=True)), - ('longitude', models.FloatField(null=True, blank=True)), - ('p_code', models.CharField(max_length=32L, null=True, blank=True)), - ('point', django.contrib.gis.db.models.fields.PointField(srid=4326, null=True, blank=True)), - ('gateway', models.ForeignKey(verbose_name=b'Location Type', to='locations.GatewayType')), - ('locality', models.ForeignKey(to='locations.Locality')), + ('latitude', models.FloatField(blank=True, null=True)), + ('longitude', models.FloatField(blank=True, null=True)), + ('p_code', models.CharField(blank=True, max_length=32L, null=True)), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)), + ('point', django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326)), + ('lft', models.PositiveIntegerField(db_index=True, editable=False)), + ('rght', models.PositiveIntegerField(db_index=True, editable=False)), + ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), + ('level', models.PositiveIntegerField(db_index=True, editable=False)), + ('gateway', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='locations.GatewayType', verbose_name=b'Location Type')), + ('locality', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Locality')), + ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='locations.Location')), ], options={ 'ordering': ['name'], }, - bases=(models.Model,), ), migrations.CreateModel( name='Region', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=45L)), - ('p_code', models.CharField(max_length=32L, null=True, blank=True)), - ('color', paintstore.fields.ColorPickerField(default=locations.models.get_random_color, max_length=7, null=True, blank=True)), - ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, null=True, blank=True)), - ('gateway', models.ForeignKey(verbose_name=b'Admin type', blank=True, to='locations.GatewayType', null=True)), - ('governorate', models.ForeignKey(to='locations.Governorate')), + ('p_code', models.CharField(blank=True, max_length=32L, null=True)), + ('color', paintstore.fields.ColorPickerField(blank=True, default=locations.models.get_random_color, max_length=7, null=True)), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)), + ('gateway', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.GatewayType', verbose_name=b'Admin type')), + ('governorate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='locations.Governorate')), ], options={ 'ordering': ['name'], 'verbose_name': 'District', }, - bases=(models.Model,), - ), - migrations.AlterUniqueTogether( - name='location', - unique_together=set([('name', 'gateway', 'p_code')]), ), migrations.AddField( model_name='locality', name='region', - field=models.ForeignKey(to='locations.Region'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='locations.Region'), ), migrations.AddField( model_name='linkedlocation', name='locality', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'region', chained_field=b'region', blank=True, auto_choose=True, to='locations.Locality', null=True), - preserve_default=True, + field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field=b'region', chained_model_field=b'region', null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Locality'), ), migrations.AddField( model_name='linkedlocation', name='location', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'locality', chained_field=b'locality', blank=True, to='locations.Location', null=True), - preserve_default=True, + field=smart_selects.db_fields.ChainedForeignKey(blank=True, chained_field=b'locality', chained_model_field=b'locality', null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location'), ), migrations.AddField( model_name='linkedlocation', name='region', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'governorate', chained_field=b'governorate', auto_choose=True, to='locations.Region'), - preserve_default=True, + field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, chained_field=b'governorate', chained_model_field=b'governorate', on_delete=django.db.models.deletion.CASCADE, to='locations.Region'), ), migrations.AddField( model_name='cartodbtable', name='location_type', - field=models.ForeignKey(to='locations.GatewayType'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='locations.GatewayType'), + ), + migrations.AddField( + model_name='cartodbtable', + name='parent', + field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='locations.CartoDBTable'), + ), + migrations.AlterUniqueTogether( + name='location', + unique_together=set([('name', 'gateway', 'p_code')]), ), ] diff --git a/EquiTrack/locations/migrations/0002_auto_20151211_1528.py b/EquiTrack/locations/migrations/0002_auto_20151211_1528.py deleted file mode 100644 index c4025375f5..0000000000 --- a/EquiTrack/locations/migrations/0002_auto_20151211_1528.py +++ /dev/null @@ -1,84 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import mptt.fields -import django.contrib.gis.db.models.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('locations', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='cartodbtable', - name='level', - field=models.PositiveIntegerField(default=0, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='cartodbtable', - name='lft', - field=models.PositiveIntegerField(default=0, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='cartodbtable', - name='parent', - field=mptt.fields.TreeForeignKey(related_name='children', blank=True, to='locations.CartoDBTable', null=True), - ), - migrations.AddField( - model_name='cartodbtable', - name='rght', - field=models.PositiveIntegerField(default=0, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='cartodbtable', - name='tree_id', - field=models.PositiveIntegerField(default=0, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='location', - name='geom', - field=django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, null=True, blank=True), - ), - migrations.AddField( - model_name='location', - name='level', - field=models.PositiveIntegerField(default=0, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='location', - name='lft', - field=models.PositiveIntegerField(default=0, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='location', - name='parent', - field=mptt.fields.TreeForeignKey(related_name='children', blank=True, to='locations.Location', null=True), - ), - migrations.AddField( - model_name='location', - name='rght', - field=models.PositiveIntegerField(default=0, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='location', - name='tree_id', - field=models.PositiveIntegerField(default=0, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AlterField( - model_name='location', - name='gateway', - field=models.ForeignKey(verbose_name=b'Location Type', to='locations.GatewayType'), - ), - ] diff --git a/EquiTrack/locations/migrations/0003_auto_20151216_1339.py b/EquiTrack/locations/migrations/0003_auto_20151216_1339.py deleted file mode 100644 index 5c00aa3713..0000000000 --- a/EquiTrack/locations/migrations/0003_auto_20151216_1339.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('locations', '0002_auto_20151211_1528'), - ] - - operations = [ - migrations.AlterField( - model_name='location', - name='locality', - field=models.ForeignKey(blank=True, to='locations.Locality', null=True), - ), - ] diff --git a/EquiTrack/locations/migrations/0004_auto_20160222_1652.py b/EquiTrack/locations/migrations/0004_auto_20160222_1652.py deleted file mode 100644 index a0143e1e95..0000000000 --- a/EquiTrack/locations/migrations/0004_auto_20160222_1652.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-22 14:52 -from __future__ import unicode_literals - -from django.db import migrations -import django.db.models.manager - - -class Migration(migrations.Migration): - - dependencies = [ - ('locations', '0003_auto_20151216_1339'), - ] - - operations = [ - migrations.AlterModelManagers( - name='cartodbtable', - managers=[ - ('_default_manager', django.db.models.manager.Manager()), - ], - ), - ] diff --git a/EquiTrack/locations/migrations/0005_auto_20160226_1543.py b/EquiTrack/locations/migrations/0005_auto_20160226_1543.py deleted file mode 100644 index d83668c615..0000000000 --- a/EquiTrack/locations/migrations/0005_auto_20160226_1543.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('locations', '0004_auto_20160222_1652'), - ] - - operations = [ - migrations.AlterModelManagers( - name='cartodbtable', - managers=[ - ], - ), - ] diff --git a/EquiTrack/locations/migrations/0006_auto_20160229_1545.py b/EquiTrack/locations/migrations/0006_auto_20160229_1545.py deleted file mode 100644 index 855e64c802..0000000000 --- a/EquiTrack/locations/migrations/0006_auto_20160229_1545.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('locations', '0005_auto_20160226_1543'), - ] - - operations = [ - migrations.AlterModelOptions( - name='gatewaytype', - options={'ordering': ['name'], 'verbose_name': 'Location Type'}, - ), - ] diff --git a/EquiTrack/locations/migrations/0007_auto_20161027_2022.py b/EquiTrack/locations/migrations/0007_auto_20161027_2022.py deleted file mode 100644 index 53c04252f4..0000000000 --- a/EquiTrack/locations/migrations/0007_auto_20161027_2022.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.10 on 2016-10-27 17:22 -from __future__ import unicode_literals - -from django.db import migrations -import django.db.models.manager - - -class Migration(migrations.Migration): - - dependencies = [ - ('locations', '0006_auto_20160229_1545'), - ] - - operations = [ - migrations.AlterModelManagers( - name='cartodbtable', - managers=[ - ('_default_manager', django.db.models.manager.Manager()), - ], - ), - ] diff --git a/EquiTrack/partners/migrations/0001_initial.py b/EquiTrack/partners/migrations/0001_initial.py index 2b127e3084..ddc9e4439e 100644 --- a/EquiTrack/partners/migrations/0001_initial.py +++ b/EquiTrack/partners/migrations/0001_initial.py @@ -1,242 +1,342 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-09 22:20 from __future__ import unicode_literals -from django.db import models, migrations -import smart_selects.db_fields -import filer.fields.file import EquiTrack.mixins -import django.utils.timezone from django.conf import settings +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone +import django_hstore.fields import model_utils.fields +import partners.models +import smart_selects.db_fields class Migration(migrations.Migration): + initial = True + dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('funds', '0001_initial'), - ('filer', '0002_auto_20150606_2003'), + ('users', '__first__'), + ('reports', '__first__'), + ('locations', '__first__'), ('supplies', '0001_initial'), - ('reports', '0001_initial'), - ('locations', '0001_initial'), + ('funds', '__first__'), ] operations = [ migrations.CreateModel( name='Agreement', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), - ('start', models.DateTimeField(null=True, verbose_name='start', blank=True)), - ('end', models.DateTimeField(null=True, verbose_name='end', blank=True)), - ('agreement_type', models.CharField(max_length=10, choices=[('PCA', 'Partner Cooperation Agreement'), ('SSFA', 'Small Scale Funding Agreement'), ('MOU', 'Memorandum of Understanding'), ('ic', 'Institutional Contract'), ('AWP', 'Annual Work Plan')])), - ('agreement_number', models.CharField(help_text='PCA Reference Number', unique=True, max_length=45L)), - ('attached_agreement', models.FileField(upload_to='agreements', blank=True)), - ('signed_by_unicef_date', models.DateField(null=True, blank=True)), - ('signed_by_partner_date', models.DateField(null=True, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), + ('agreement_type', models.CharField(choices=[('PCA', 'Programme Cooperation Agreement'), ('SSFA', 'Small Scale Funding Agreement'), ('MOU', 'Memorandum of Understanding'), ('IC', 'Institutional Contract'), ('AWP', 'Work Plan')], max_length=10)), + ('agreement_number', models.CharField(blank=True, max_length=45L, verbose_name='Reference Number')), + ('attached_agreement', models.FileField(blank=True, upload_to=partners.models.get_agreement_path)), + ('start', models.DateField(blank=True, null=True)), + ('end', models.DateField(blank=True, null=True)), + ('signed_by_unicef_date', models.DateField(blank=True, null=True)), + ('signed_by_partner_date', models.DateField(blank=True, null=True)), + ('bank_name', models.CharField(blank=True, max_length=255, null=True)), + ('bank_address', models.CharField(blank=True, max_length=256L)), + ('account_title', models.CharField(blank=True, max_length=255, null=True)), + ('account_number', models.CharField(blank=True, max_length=50, null=True)), + ('routing_details', models.CharField(blank=True, help_text=b'Routing Details, including SWIFT/IBAN (if applicable)', max_length=255, null=True)), + ('bank_contact_person', models.CharField(blank=True, max_length=255, null=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='AgreementAmendmentLog', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), + ('type', models.CharField(choices=[(b'Authorised Officers', b'Authorised Officers'), (b'Banking Info', b'Banking Info'), (b'Agreement Changes', b'Agreement Changes'), (b'Additional Clauses', b'Additional Clauses')], max_length=50)), + ('amended_at', models.DateField(null=True, verbose_name=b'Signed At')), + ('status', models.CharField(blank=True, choices=[('in_process', 'In Process'), ('active', 'Active'), ('implemented', 'Implemented'), ('cancelled', 'Cancelled')], max_length=32L)), + ('agreement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='amendments_log', to='partners.Agreement')), ], options={ 'abstract': False, }, - bases=(models.Model,), ), migrations.CreateModel( name='AmendmentLog', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), - ('type', models.CharField(max_length=50, choices=[(b'No Cost', b'No Cost'), (b'Cost', b'Cost'), (b'Activity', b'Activity'), (b'Other', b'Other')])), - ('amended_at', models.DateField(null=True)), - ('amendment_number', models.IntegerField(default=0)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), + ('type', models.CharField(choices=[(b'No Cost', b'No Cost'), (b'Cost', b'Cost'), (b'Activity', b'Activity'), (b'Other', b'Other')], max_length=50)), + ('amended_at', models.DateField(null=True, verbose_name=b'Signed At')), + ('status', models.CharField(blank=True, choices=[('in_process', 'In Process'), ('active', 'Active'), ('implemented', 'Implemented'), ('cancelled', 'Cancelled')], max_length=32L)), ], options={ 'abstract': False, }, - bases=(models.Model,), ), migrations.CreateModel( name='Assessment', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('type', models.CharField(max_length=50, choices=[('Micro Assessment', 'Micro Assessment'), ('Simplified Checklist', 'Simplified Checklist'), ('Scheduled Audit report', 'Scheduled Audit report'), ('Special Audit report', 'Special Audit report'), ('Other', 'Other')])), - ('names_of_other_agencies', models.CharField(help_text='List the names of the other agencies they have worked with', max_length=255, null=True, blank=True)), - ('expected_budget', models.IntegerField(verbose_name='Planned amount')), - ('notes', models.CharField(help_text='Note any special requests to be considered during the assessment', max_length=255, null=True, verbose_name='Special requests', blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('type', models.CharField(choices=[('Micro Assessment', 'Micro Assessment'), ('Simplified Checklist', 'Simplified Checklist'), ('Scheduled Audit report', 'Scheduled Audit report'), ('Special Audit report', 'Special Audit report'), ('High Risk Assumed', 'High Risk Assumed'), ('Other', 'Other')], max_length=50)), + ('names_of_other_agencies', models.CharField(blank=True, help_text='List the names of the other agencies they have worked with', max_length=255, null=True)), + ('expected_budget', models.IntegerField(blank=True, null=True, verbose_name='Planned amount')), + ('notes', models.CharField(blank=True, help_text='Note any special requests to be considered during the assessment', max_length=255, null=True, verbose_name='Special requests')), ('requested_date', models.DateField(auto_now_add=True)), - ('planned_date', models.DateField(null=True, blank=True)), - ('completed_date', models.DateField(null=True, blank=True)), - ('rating', models.CharField(default='high', max_length=50, choices=[('high', 'High'), ('significant', 'Significant'), ('moderate', 'Moderate'), ('low', 'Low')])), - ('report', models.FileField(null=True, upload_to=b'assessments', blank=True)), - ('current', models.BooleanField(default=True, verbose_name='Basis for risk rating')), - ('approving_officer', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True)), + ('planned_date', models.DateField(blank=True, null=True)), + ('completed_date', models.DateField(blank=True, null=True)), + ('rating', models.CharField(choices=[('high', 'High'), ('significant', 'Significant'), ('medium', 'Medium'), ('low', 'Low')], default='high', max_length=50)), + ('report', models.FileField(blank=True, null=True, upload_to=b'assessments')), + ('current', models.BooleanField(default=False, verbose_name='Basis for risk rating')), + ('approving_officer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='AuthorizedOfficer', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('agreement', models.ForeignKey(related_name='authorized_officers', to='partners.Agreement')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('agreement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='authorized_officers', to='partners.Agreement')), + ('amendment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.AgreementAmendmentLog')), + ], + ), + migrations.CreateModel( + name='BankDetails', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('bank_name', models.CharField(blank=True, max_length=255, null=True)), + ('bank_address', models.CharField(blank=True, max_length=256L)), + ('account_title', models.CharField(blank=True, max_length=255, null=True)), + ('account_number', models.CharField(blank=True, max_length=50, null=True)), + ('routing_details', models.CharField(blank=True, help_text=b'Routing Details, including SWIFT/IBAN (if applicable)', max_length=255, null=True)), + ('bank_contact_person', models.CharField(blank=True, max_length=255, null=True)), + ('agreement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bank_details', to='partners.Agreement')), + ('amendment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.AgreementAmendmentLog')), + ], + ), + migrations.CreateModel( + name='DirectCashTransfer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('fc_ref', models.CharField(max_length=50)), + ('amount_usd', models.DecimalField(decimal_places=2, max_digits=10)), + ('liquidation_usd', models.DecimalField(decimal_places=2, max_digits=10)), + ('outstanding_balance_usd', models.DecimalField(decimal_places=2, max_digits=10)), + ('amount_less_than_3_Months_usd', models.DecimalField(decimal_places=2, max_digits=10)), + ('amount_3_to_6_months_usd', models.DecimalField(decimal_places=2, max_digits=10)), + ('amount_6_to_9_months_usd', models.DecimalField(decimal_places=2, max_digits=10)), + ('amount_more_than_9_Months_usd', models.DecimalField(decimal_places=2, max_digits=10)), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='DistributionPlan', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('quantity', models.PositiveIntegerField(help_text='Quantity required for this location')), ('send', models.BooleanField(default=False, verbose_name='Send to partner?')), ('sent', models.BooleanField(default=False)), + ('document', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), ('delivered', models.IntegerField(default=0)), - ('item', models.ForeignKey(to='supplies.SupplyItem')), - ('location', models.ForeignKey(to='locations.Region')), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='supplies.SupplyItem')), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='FileType', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=64L)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64L, unique=True)), + ], + ), + migrations.CreateModel( + name='FundingCommitment', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('start', models.DateTimeField(blank=True, null=True, verbose_name='start')), + ('end', models.DateTimeField(blank=True, null=True, verbose_name='end')), + ('fr_number', models.CharField(max_length=50)), + ('wbs', models.CharField(max_length=50)), + ('fc_type', models.CharField(max_length=50)), + ('fc_ref', models.CharField(blank=True, max_length=50, null=True, unique=True)), + ('fr_item_amount_usd', models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True)), + ('agreement_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True)), + ('commitment_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True)), + ('expenditure_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True)), + ('grant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='funds.Grant')), ], options={ + 'abstract': False, }, - bases=(models.Model,), + ), + migrations.CreateModel( + name='GovernmentIntervention', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('number', models.CharField(blank=True, max_length=45L, verbose_name=b'Reference Number')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ], + ), + migrations.CreateModel( + name='GovernmentInterventionResult', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('year', models.CharField(max_length=4)), + ('planned_amount', models.IntegerField(default=0, verbose_name=b'Planned Cash Transfers')), + ('activities', django_hstore.fields.DictionaryField(blank=True, null=True)), + ('planned_visits', models.IntegerField(default=0)), + ('activities_list', models.ManyToManyField(blank=True, related_name='activities_list', to='reports.Result')), + ('intervention', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='results', to='partners.GovernmentIntervention')), + ('result', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.Result')), + ('section', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='users.Section')), + ('sector', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.Sector', verbose_name=b'Programme/Sector')), + ('unicef_managers', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name=b'Unicef focal points')), + ], ), migrations.CreateModel( name='GwPCALocation', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('tpm_visit', models.BooleanField(default=False)), - ('governorate', models.ForeignKey(to='locations.Governorate')), - ('locality', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'region', chained_field=b'region', blank=True, auto_choose=True, to='locations.Locality', null=True)), - ('location', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'locality', chained_field=b'locality', blank=True, auto_choose=True, to='locations.Location', null=True)), + ('governorate', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Governorate')), + ('locality', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Locality')), + ('location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location')), ], options={ 'verbose_name': 'Partnership Location', }, - bases=(models.Model,), ), migrations.CreateModel( - name='IndicatorProgress', + name='IndicatorDueDates', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('programmed', models.PositiveIntegerField()), - ('current', models.IntegerField(default=0, null=True, blank=True)), - ('indicator', models.ForeignKey(to='reports.Indicator')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('due_date', models.DateField(blank=True, null=True)), ], options={ + 'ordering': ['-due_date'], + 'verbose_name': 'Report Due Date', + 'verbose_name_plural': 'Report Due Dates', + }, + ), + migrations.CreateModel( + name='IndicatorReport', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), + ('start', models.DateTimeField(blank=True, null=True, verbose_name='start')), + ('end', models.DateTimeField(blank=True, null=True, verbose_name='end')), + ('total', models.PositiveIntegerField()), + ('disaggregated', models.BooleanField(default=False)), + ('disaggregation', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('remarks', models.TextField(blank=True, null=True)), + ('report_status', models.CharField(choices=[(b'ontrack', 'On Track'), (b'constrained', 'Constrained'), (b'noprogress', 'No Progress'), (b'targetmet', 'Target Met')], default=b'ontrack', max_length=15)), + ('indicator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reports', to='reports.Indicator')), + ('location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location')), + ], + options={ + 'abstract': False, }, - bases=(models.Model,), ), migrations.CreateModel( name='PartnerOrganization', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('type', models.CharField(default='national', max_length=50, verbose_name='CSO Type', choices=[('international', 'International'), ('national', 'CSO'), ('cbo', 'CBO'), (('academic',), 'Academic Inst.'), (('foundation',), 'Foundation')])), - ('partner_type', models.CharField(blank=True, max_length=50, null=True, choices=[('Government', 'Government'), ('Civil Society Organisation', 'Civil Society Organisation'), ('UN Agency', 'UN Agency'), ('Inter-governmental Organisation', 'Inter-governmental Organisation'), ('Bi-Lateral Organisation', 'Bi-Lateral Organisation')])), - ('name', models.CharField(help_text='Please make sure this matches the name you enter in VISION', unique=True, max_length=255, verbose_name=b'Full Name')), - ('short_name', models.CharField(max_length=50, blank=True)), - ('description', models.CharField(max_length=256L, blank=True)), - ('address', models.TextField(null=True, blank=True)), - ('email', models.CharField(max_length=255, blank=True)), - ('phone_number', models.CharField(max_length=32L, blank=True)), - ('vendor_number', models.BigIntegerField(null=True, blank=True)), - ('alternate_id', models.IntegerField(null=True, blank=True)), - ('alternate_name', models.CharField(max_length=255, null=True, blank=True)), - ('rating', models.CharField(default='high', max_length=50, verbose_name='Risk Rating', choices=[('high', 'High'), ('significant', 'Significant'), ('moderate', 'Moderate'), ('low', 'Low')])), - ('core_values_assessment_date', models.DateField(null=True, verbose_name='Date positively assessed against core values', blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('partner_type', models.CharField(choices=[('Bilateral / Multilateral', 'Bilateral / Multilateral'), ('Civil Society Organization', 'Civil Society Organization'), ('Government', 'Government'), ('UN Agency', 'UN Agency')], max_length=50)), + ('cso_type', models.CharField(blank=True, choices=[('International', 'International'), ('National', 'National'), ('Community Based Organisation', 'Community Based Organisation'), ('Academic Institution', 'Academic Institution')], max_length=50, null=True, verbose_name='CSO Type')), + ('name', models.CharField(help_text='Please make sure this matches the name you enter in VISION', max_length=255, verbose_name=b'Full Name')), + ('short_name', models.CharField(blank=True, max_length=50)), + ('description', models.CharField(blank=True, max_length=256L)), + ('shared_partner', models.CharField(choices=[('No', 'No'), ('with UNDP', 'with UNDP'), ('with UNFPA', 'with UNFPA'), ('with UNDP & UNFPA', 'with UNDP & UNFPA')], default='No', help_text='Partner shared with UNDP or UNFPA?', max_length=50)), + ('address', models.TextField(blank=True, null=True)), + ('email', models.CharField(blank=True, max_length=255, null=True)), + ('phone_number', models.CharField(blank=True, max_length=32L, null=True)), + ('vendor_number', models.CharField(blank=True, max_length=30, null=True, unique=True)), + ('alternate_id', models.IntegerField(blank=True, null=True)), + ('alternate_name', models.CharField(blank=True, max_length=255, null=True)), + ('rating', models.CharField(max_length=50, null=True, verbose_name='Risk Rating')), + ('type_of_assessment', models.CharField(max_length=50, null=True)), + ('last_assessment_date', models.DateField(blank=True, null=True)), + ('core_values_assessment_date', models.DateField(blank=True, null=True, verbose_name='Date positively assessed against core values')), + ('core_values_assessment', models.FileField(blank=True, help_text='Only required for CSO partners', null=True, upload_to=b'partners/core_values/')), + ('vision_synced', models.BooleanField(default=False)), + ('hidden', models.BooleanField(default=False)), + ('deleted_flag', models.BooleanField(default=False, verbose_name='Marked for deletion')), + ('total_ct_cp', models.DecimalField(blank=True, decimal_places=2, help_text=b'Total Cash Transferred for Country Programme', max_digits=12, null=True)), + ('total_ct_cy', models.DecimalField(blank=True, decimal_places=2, help_text=b'Total Cash Transferred per Current Year', max_digits=12, null=True)), + ('hact_values', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}, null=True)), ], options={ 'ordering': ['name'], }, - bases=(models.Model,), + bases=(EquiTrack.mixins.AdminURLMixin, models.Model), ), migrations.CreateModel( name='PartnershipBudget', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), ('partner_contribution', models.IntegerField(default=0)), ('unicef_cash', models.IntegerField(default=0)), - ('in_kind_amount', models.IntegerField(default=0)), + ('in_kind_amount', models.IntegerField(default=0, verbose_name=b'UNICEF Supplies')), + ('year', models.CharField(blank=True, max_length=5, null=True)), ('total', models.IntegerField(default=0)), - ('amendment', models.ForeignKey(related_name='budgets', blank=True, to='partners.AmendmentLog', null=True)), + ('amendment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='budgets', to='partners.AmendmentLog')), ], options={ 'abstract': False, }, - bases=(models.Model,), ), migrations.CreateModel( name='PartnerStaffMember', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('title', models.CharField(max_length=64L)), ('first_name', models.CharField(max_length=64L)), ('last_name', models.CharField(max_length=64L)), - ('email', models.CharField(max_length=128L)), - ('phone', models.CharField(max_length=64L, blank=True)), - ('partner', models.ForeignKey(to='partners.PartnerOrganization')), + ('email', models.CharField(max_length=128L, unique=True)), + ('phone', models.CharField(blank=True, max_length=64L)), + ('active', models.BooleanField(default=True)), + ('partner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.PartnerOrganization')), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='PCA', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('partnership_type', models.CharField(default='pd', choices=[('pd', 'Programme Document'), ('shpd', 'Simplified Humanitarian Programme Document'), ('dct', 'DCT to Government')], max_length=255, blank=True, null=True, verbose_name='Document type')), - ('number', models.CharField(default='UNASSIGNED', help_text='PRC Reference Number', max_length=45L, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('partnership_type', models.CharField(blank=True, choices=[('PD', 'Programme Document'), ('SHPD', 'Simplified Humanitarian Programme Document'), ('AWP', 'Cash Transfers to Government'), ('SSFA', 'SSFA TOR'), ('IC', 'IC TOR')], default='PD', max_length=255, null=True, verbose_name='Document type')), + ('number', models.CharField(blank=True, max_length=45L, null=True, verbose_name='Reference Number')), ('title', models.CharField(max_length=256L)), - ('status', models.CharField(default='in_process', help_text='In Process = In discussion with partner, Active = Currently ongoing, Implemented = completed, Cancelled = cancelled or not approved', max_length=32L, blank=True, choices=[('in_process', 'In Process'), ('active', 'Active'), ('implemented', 'Implemented'), ('cancelled', 'Cancelled')])), - ('start_date', models.DateField(help_text='The date the partnership will start', null=True, blank=True)), - ('end_date', models.DateField(help_text='The date the partnership will end', null=True, blank=True)), + ('project_type', models.CharField(blank=True, choices=[('Bulk Procurement', 'Bulk Procurement'), ('Construction Project', 'Construction Project')], max_length=20, null=True)), + ('status', models.CharField(blank=True, choices=[('in_process', 'In Process'), ('active', 'Active'), ('implemented', 'Implemented'), ('cancelled', 'Cancelled')], default='in_process', help_text='In Process = In discussion with partner, Active = Currently ongoing, Implemented = completed, Cancelled = cancelled or not approved', max_length=32)), + ('start_date', models.DateField(blank=True, help_text='The date the Intervention will start', null=True)), + ('end_date', models.DateField(blank=True, help_text='The date the Intervention will end', null=True)), ('initiation_date', models.DateField(help_text='The date the partner submitted complete partnership documents to Unicef', verbose_name='Submission Date')), - ('submission_date', models.DateField(help_text='The date the documents were submitted to the PRC', null=True, verbose_name='Submission Date to PRC', blank=True)), - ('review_date', models.DateField(help_text='The date the PRC reviewed the partnership', null=True, verbose_name='Review date by PRC', blank=True)), - ('signed_by_unicef_date', models.DateField(null=True, blank=True)), - ('signed_by_partner_date', models.DateField(null=True, blank=True)), - ('unicef_mng_first_name', models.CharField(max_length=64L, blank=True)), - ('unicef_mng_last_name', models.CharField(max_length=64L, blank=True)), - ('unicef_mng_email', models.CharField(max_length=128L, blank=True)), - ('partner_mng_first_name', models.CharField(max_length=64L, blank=True)), - ('partner_mng_last_name', models.CharField(max_length=64L, blank=True)), - ('partner_mng_email', models.CharField(max_length=128L, blank=True)), - ('partner_mng_phone', models.CharField(max_length=64L, blank=True)), - ('partner_contribution_budget', models.IntegerField(default=0, null=True, blank=True)), - ('unicef_cash_budget', models.IntegerField(default=0, null=True, blank=True)), - ('in_kind_amount_budget', models.IntegerField(default=0, null=True, blank=True)), - ('cash_for_supply_budget', models.IntegerField(default=0, null=True, blank=True)), - ('total_cash', models.IntegerField(default=0, null=True, verbose_name=b'Total Budget', blank=True)), - ('sectors', models.CharField(max_length=255, null=True, blank=True)), + ('submission_date', models.DateField(blank=True, help_text='The date the documents were submitted to the PRC', null=True, verbose_name='Submission Date to PRC')), + ('review_date', models.DateField(blank=True, help_text='The date the PRC reviewed the partnership', null=True, verbose_name='Review date by PRC')), + ('signed_by_unicef_date', models.DateField(blank=True, null=True)), + ('signed_by_partner_date', models.DateField(blank=True, null=True)), + ('fr_number', models.CharField(blank=True, max_length=50, null=True)), + ('planned_visits', models.IntegerField(default=0)), + ('sectors', models.CharField(blank=True, max_length=255, null=True)), ('current', models.BooleanField(default=True)), ('created_at', models.DateTimeField(auto_now_add=True)), ('updated_at', models.DateTimeField(auto_now=True)), - ('amendment', models.BooleanField(default=False)), - ('amended_at', models.DateTimeField(null=True)), - ('amendment_number', models.IntegerField(default=0)), - ('agreement', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'partner', chained_field=b'partner', blank=True, auto_choose=True, to='partners.Agreement', null=True)), - ('original', models.ForeignKey(related_name='amendments', to='partners.PCA', null=True)), - ('partner', models.ForeignKey(to='partners.PartnerOrganization')), - ('partner_focal_point', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'partner', related_name='my_partnerships', chained_field=b'partner', blank=True, to='partners.PartnerStaffMember', null=True)), - ('partner_manager', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'partner', related_name='signed_partnerships', chained_field=b'partner', verbose_name='Signed by partner', blank=True, to='partners.PartnerStaffMember', null=True)), - ('result_structure', models.ForeignKey(blank=True, to='reports.ResultStructure', help_text='Which result structure does this partnership report under?', null=True)), - ('unicef_manager', models.ForeignKey(related_name='approved_partnerships', verbose_name='Signed by', blank=True, to=settings.AUTH_USER_MODEL, null=True)), - ('unicef_managers', models.ManyToManyField(to=settings.AUTH_USER_MODEL, verbose_name=b'Unicef focal points', blank=True)), + ('agreement', smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field=b'partner', chained_model_field=b'partner', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='interventions', to='partners.Agreement')), + ('partner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='partners.PartnerOrganization')), + ('partner_focal_point', smart_selects.db_fields.ChainedForeignKey(blank=True, chained_field=b'partner', chained_model_field=b'partner', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='my_partnerships', to='partners.PartnerStaffMember')), + ('partner_manager', smart_selects.db_fields.ChainedForeignKey(blank=True, chained_field=b'partner', chained_model_field=b'partner', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='signed_partnerships', to='partners.PartnerStaffMember', verbose_name='Signed by partner')), + ('result_structure', models.ForeignKey(blank=True, help_text='Which result structure does this partnership report under?', null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='reports.ResultStructure')), + ('unicef_manager', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='approved_partnerships', to=settings.AUTH_USER_MODEL, verbose_name='Signed by')), + ('unicef_managers', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name=b'Unicef focal points')), ], options={ - 'ordering': ['-number', 'amendment'], + 'ordering': ['-created_at'], 'verbose_name': 'Intervention', 'verbose_name_plural': 'Interventions', }, @@ -245,219 +345,180 @@ class Migration(migrations.Migration): migrations.CreateModel( name='PCAFile', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('file', filer.fields.file.FilerFileField(to='filer.File')), - ('pca', models.ForeignKey(to='partners.PCA')), - ('type', models.ForeignKey(to='partners.FileType')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('attachment', models.FileField(max_length=255, upload_to=partners.models.get_file_path)), + ('pca', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='partners.PCA')), + ('type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.FileType')), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='PCAGrant', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), - ('funds', models.IntegerField(null=True, blank=True)), - ('amendment', models.ForeignKey(related_name='grants', blank=True, to='partners.AmendmentLog', null=True)), - ('grant', models.ForeignKey(to='funds.Grant')), - ('partnership', models.ForeignKey(to='partners.PCA')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), + ('funds', models.IntegerField(blank=True, null=True)), + ('amendment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='grants', to='partners.AmendmentLog')), + ('grant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.Grant')), + ('partnership', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.PCA')), ], options={ 'ordering': ['-funds'], }, - bases=(models.Model,), ), migrations.CreateModel( name='PCASector', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), - ('amendment', models.ForeignKey(related_name='sectors', blank=True, to='partners.AmendmentLog', null=True)), - ('pca', models.ForeignKey(to='partners.PCA')), - ('sector', models.ForeignKey(to='reports.Sector')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), + ('amendment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sectors', to='partners.AmendmentLog')), + ('pca', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.PCA')), + ('sector', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.Sector')), ], options={ 'verbose_name': 'PCA Sector', }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='PCASectorActivity', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('activity', models.ForeignKey(to='reports.Activity')), - ('pca_sector', models.ForeignKey(to='partners.PCASector')), - ], - options={ - 'verbose_name': 'Activity', - 'verbose_name_plural': 'Activities', - }, - bases=(models.Model,), ), migrations.CreateModel( name='PCASectorGoal', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('goal', models.ForeignKey(to='reports.Goal')), - ('pca_sector', models.ForeignKey(to='partners.PCASector')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('goal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.Goal')), + ('pca_sector', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.PCASector')), ], options={ 'verbose_name': 'CCC', 'verbose_name_plural': 'CCCs', }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='PCASectorImmediateResult', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('Intermediate_result', models.ForeignKey(to='reports.IntermediateResult')), - ('pca_sector', models.ForeignKey(to='partners.PCASector')), - ('wbs_activities', models.ManyToManyField(to='reports.WBS')), - ], - options={ - 'verbose_name': 'Intermediate Result', - 'verbose_name_plural': 'Intermediate Results', - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='PCASectorOutput', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('output', models.ForeignKey(to='reports.Rrp5Output')), - ('pca_sector', models.ForeignKey(to='partners.PCASector')), - ], - options={ - 'verbose_name': 'Output', - 'verbose_name_plural': 'Outputs', - }, - bases=(models.Model,), ), migrations.CreateModel( - name='Recommendation', + name='RAMIndicator', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('subject_area', models.CharField(max_length=50, choices=[('partner', 'Implementing Partner'), ('funds', 'Funds Flow'), ('staff', 'Staffing'), ('policy', 'Acct Policies & Procedures'), ('int-audit', 'Internal Audit'), ('ext-audit', 'External Audit'), ('reporting', 'Reporting and Monitoring'), ('systems', 'Information Systems')])), - ('description', models.CharField(max_length=254)), - ('level', models.CharField(max_length=50, verbose_name='Priority Flag', choices=[('high', 'High'), ('significant', 'Significant'), ('moderate', 'Moderate'), ('low', 'Low')])), - ('closed', models.BooleanField(default=False, verbose_name='Closed?')), - ('completed_date', models.DateField(null=True, blank=True)), - ('assessment', models.ForeignKey(to='partners.Assessment')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('indicator', smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field=b'result', chained_model_field=b'result', null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.Indicator')), + ('intervention', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='indicators', to='partners.PCA')), + ('result', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.Result')), ], - options={ - 'verbose_name': 'Key recommendation', - 'verbose_name_plural': 'Key recommendations', - }, - bases=(models.Model,), ), migrations.CreateModel( name='ResultChain', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('target', models.PositiveIntegerField(null=True, blank=True)), - ('governorate', models.ForeignKey(blank=True, to='locations.Governorate', null=True)), - ('indicator', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'result', chained_field=b'result', blank=True, auto_choose=True, to='reports.Indicator', null=True)), - ('partnership', models.ForeignKey(related_name='results', to='partners.PCA')), - ('result', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'result_type', to='reports.Result', chained_field=b'result_type')), - ('result_type', models.ForeignKey(to='reports.ResultType')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('code', models.CharField(blank=True, max_length=50, null=True)), + ('target', models.PositiveIntegerField(blank=True, null=True)), + ('current_progress', models.PositiveIntegerField(default=0)), + ('partner_contribution', models.IntegerField(default=0)), + ('unicef_cash', models.IntegerField(default=0)), + ('in_kind_amount', models.IntegerField(default=0)), + ('disaggregation', django.contrib.postgres.fields.jsonb.JSONField(null=True)), + ('indicator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.Indicator')), + ('partnership', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='results', to='partners.PCA')), + ('result', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.Result')), + ('result_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.ResultType')), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='SupplyPlan', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('quantity', models.PositiveIntegerField(help_text='Total quantity needed for this intervention')), - ('item', models.ForeignKey(to='supplies.SupplyItem')), - ('partnership', models.ForeignKey(related_name='supply_plans', to='partners.PCA')), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='supplies.SupplyItem')), + ('partnership', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='supply_plans', to='partners.PCA')), ], - options={ - }, - bases=(models.Model,), ), migrations.AddField( model_name='partnershipbudget', name='partnership', - field=models.ForeignKey(related_name='budget_log', to='partners.PCA'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='budget_log', to='partners.PCA'), + ), + migrations.AlterUniqueTogether( + name='partnerorganization', + unique_together=set([('name', 'vendor_number')]), ), migrations.AddField( - model_name='indicatorprogress', - name='pca_sector', - field=models.ForeignKey(to='partners.PCASector'), - preserve_default=True, + model_name='indicatorreport', + name='partner_staff_member', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='indicator_reports', to='partners.PartnerStaffMember'), + ), + migrations.AddField( + model_name='indicatorreport', + name='result_chain', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='indicator_reports', to='partners.ResultChain'), + ), + migrations.AddField( + model_name='indicatorduedates', + name='intervention', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='indicator_due_dates', to='partners.PCA'), ), migrations.AddField( model_name='gwpcalocation', name='pca', - field=models.ForeignKey(related_name='locations', to='partners.PCA'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='locations', to='partners.PCA'), ), migrations.AddField( model_name='gwpcalocation', name='region', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'governorate', chained_field=b'governorate', auto_choose=True, to='locations.Region'), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Region'), ), migrations.AddField( model_name='gwpcalocation', name='sector', - field=models.ForeignKey(blank=True, to='reports.Sector', null=True), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.Sector'), + ), + migrations.AddField( + model_name='governmentintervention', + name='partner', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='work_plans', to='partners.PartnerOrganization'), + ), + migrations.AddField( + model_name='governmentintervention', + name='result_structure', + field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='reports.ResultStructure'), ), migrations.AddField( model_name='distributionplan', name='partnership', - field=models.ForeignKey(related_name='distribution_plans', to='partners.PCA'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='distribution_plans', to='partners.PCA'), + ), + migrations.AddField( + model_name='distributionplan', + name='site', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location'), ), migrations.AddField( model_name='authorizedofficer', name='officer', - field=models.ForeignKey(to='partners.PartnerStaffMember'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.PartnerStaffMember'), ), migrations.AddField( model_name='assessment', name='partner', - field=models.ForeignKey(to='partners.PartnerOrganization'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='assessments', to='partners.PartnerOrganization'), ), migrations.AddField( model_name='assessment', name='requesting_officer', - field=models.ForeignKey(related_name='requested_assessments', to=settings.AUTH_USER_MODEL), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='requested_assessments', to=settings.AUTH_USER_MODEL), ), migrations.AddField( model_name='amendmentlog', name='partnership', - field=models.ForeignKey(related_name='amendments_log', to='partners.PCA'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='amendments_log', to='partners.PCA'), ), migrations.AddField( model_name='agreement', name='partner', - field=models.ForeignKey(to='partners.PartnerOrganization'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.PartnerOrganization'), ), migrations.AddField( model_name='agreement', name='partner_manager', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'partner', chained_field=b'partner', verbose_name='Signed by partner', blank=True, to='partners.PartnerStaffMember', null=True), - preserve_default=True, + field=smart_selects.db_fields.ChainedForeignKey(blank=True, chained_field=b'partner', chained_model_field=b'partner', null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.PartnerStaffMember', verbose_name='Signed by partner'), ), migrations.AddField( model_name='agreement', name='signed_by', - field=models.ForeignKey(related_name='signed_pcas', blank=True, to=settings.AUTH_USER_MODEL, null=True), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='signed_pcas', to=settings.AUTH_USER_MODEL), ), ] diff --git a/EquiTrack/partners/migrations/0002_auto_20151009_2046.py b/EquiTrack/partners/migrations/0002_auto_20151009_2046.py deleted file mode 100644 index b2d6174202..0000000000 --- a/EquiTrack/partners/migrations/0002_auto_20151009_2046.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='partnerorganization', - name='core_values_assessment', - field=models.FileField(upload_to=b'partners/core_values/', null=True, verbose_name='Date positively assessed against core values', blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='partnerorganization', - name='partner_type', - field=models.CharField(max_length=50, choices=[('Government', 'Government'), ('Civil Society Organisation', 'Civil Society Organisation'), ('UN Agency', 'UN Agency'), ('Inter-governmental Organisation', 'Inter-governmental Organisation'), ('Bi-Lateral Organisation', 'Bi-Lateral Organisation')]), - preserve_default=True, - ), - migrations.AlterField( - model_name='partnerorganization', - name='type', - field=models.CharField(default='national', max_length=50, verbose_name='CSO Type', choices=[('international', 'International NGO'), set(['national', 'NGO']), ('cbo', 'CBO'), (('academic',), 'Academic Institution')]), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0003_auto_20151012_1321.py b/EquiTrack/partners/migrations/0003_auto_20151012_1321.py deleted file mode 100644 index dd0c79d084..0000000000 --- a/EquiTrack/partners/migrations/0003_auto_20151012_1321.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0002_auto_20151009_2046'), - ] - - operations = [ - migrations.RemoveField( - model_name='pcasectoractivity', - name='activity', - ), - migrations.RemoveField( - model_name='pcasectoractivity', - name='pca_sector', - ), - migrations.DeleteModel( - name='PCASectorActivity', - ), - migrations.RemoveField( - model_name='pcasectorimmediateresult', - name='Intermediate_result', - ), - migrations.RemoveField( - model_name='pcasectorimmediateresult', - name='pca_sector', - ), - migrations.RemoveField( - model_name='pcasectorimmediateresult', - name='wbs_activities', - ), - migrations.DeleteModel( - name='PCASectorImmediateResult', - ), - migrations.RemoveField( - model_name='pcasectoroutput', - name='output', - ), - migrations.RemoveField( - model_name='pcasectoroutput', - name='pca_sector', - ), - migrations.DeleteModel( - name='PCASectorOutput', - ), - migrations.AlterField( - model_name='partnerorganization', - name='core_values_assessment', - field=models.FileField(null=True, upload_to=b'partners/core_values/', blank=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0004_auto_20151014_0817.py b/EquiTrack/partners/migrations/0004_auto_20151014_0817.py deleted file mode 100644 index 5821d1f1ef..0000000000 --- a/EquiTrack/partners/migrations/0004_auto_20151014_0817.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0003_auto_20151012_1321'), - ] - - operations = [ - migrations.AlterField( - model_name='agreement', - name='agreement_number', - field=models.CharField(help_text='Reference Number', unique=True, max_length=45L, blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='agreement', - name='agreement_type', - field=models.CharField(max_length=10, choices=[('PCA', 'Partner Cooperation Agreement'), ('SSFA', 'Small Scale Funding Agreement'), ('MOU', 'Memorandum of Understanding'), ('ic', 'Institutional Contract'), ('AWP', 'Work Plan')]), - preserve_default=True, - ), - migrations.AlterField( - model_name='partnerorganization', - name='partner_type', - field=models.CharField(max_length=50, choices=[('--------', '--------'), ('Government', 'Government'), ('Civil Society Organisation', 'Civil Society Organisation'), ('UN Agency', 'UN Agency'), ('Inter-governmental Organisation', 'Inter-governmental Organisation'), ('Bi-Lateral Organisation', 'Bi-Lateral Organisation')]), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0005_auto_20151014_1955.py b/EquiTrack/partners/migrations/0005_auto_20151014_1955.py deleted file mode 100644 index 77fe2060b9..0000000000 --- a/EquiTrack/partners/migrations/0005_auto_20151014_1955.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0004_auto_20151014_0817'), - ] - - operations = [ - migrations.AddField( - model_name='partnershipbudget', - name='year', - field=models.CharField(max_length=5, null=True, blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='agreement', - name='agreement_type', - field=models.CharField(max_length=10, choices=[('PCA', 'Programme Cooperation Agreement'), ('SSFA', 'Small Scale Funding Agreement'), ('MOU', 'Memorandum of Understanding'), ('ic', 'Institutional Contract'), ('AWP', 'Work Plan')]), - preserve_default=True, - ), - migrations.AlterField( - model_name='partnerorganization', - name='core_values_assessment', - field=models.FileField(help_text='Only required for CSO partners', null=True, upload_to=b'partners/core_values/', blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='partnerorganization', - name='type', - field=models.CharField(default='national', max_length=50, verbose_name='CSO Type', choices=[('international', 'International NGO'), set(['National NGO', 'national']), ('cbo', 'CBO'), (('academic',), 'Academic Institution')]), - preserve_default=True, - ), - migrations.AlterField( - model_name='partnershipbudget', - name='in_kind_amount', - field=models.IntegerField(default=0, verbose_name=b'UNICEF Supplies'), - preserve_default=True, - ), - migrations.AlterField( - model_name='pca', - name='partnership_type', - field=models.CharField(default='pd', choices=[('pd', 'Programme Document'), ('shpd', 'Simplified Humanitarian Programme Document'), ('dct', 'Cash Transfer'), ('ssfa', 'SSFA ToR')], max_length=255, blank=True, null=True, verbose_name='Document type'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0006_auto_20151015_1202.py b/EquiTrack/partners/migrations/0006_auto_20151015_1202.py deleted file mode 100644 index 4901681191..0000000000 --- a/EquiTrack/partners/migrations/0006_auto_20151015_1202.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0005_auto_20151014_1955'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='partner_type', - field=models.CharField(max_length=50, choices=[('Government', 'Government'), ('Civil Society Organisation', 'Civil Society Organisation'), ('UN Agency', 'UN Agency'), ('Inter-governmental Organisation', 'Inter-governmental Organisation'), ('Bi-Lateral Organisation', 'Bi-Lateral Organisation')]), - preserve_default=True, - ), - migrations.AlterField( - model_name='partnerorganization', - name='type', - field=models.CharField(default='national', max_length=50, verbose_name='CSO Type', choices=[('', '------'), ('international', 'International NGO'), set(['National NGO', 'national']), ('cbo', 'CBO'), (('academic',), 'Academic Institution')]), - preserve_default=True, - ), - migrations.AlterField( - model_name='pca', - name='number', - field=models.CharField(default='UNASSIGNED', help_text='Document Reference Number', max_length=45L, blank=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0007_auto_20151018_2024.py b/EquiTrack/partners/migrations/0007_auto_20151018_2024.py deleted file mode 100644 index 8499a9fbd8..0000000000 --- a/EquiTrack/partners/migrations/0007_auto_20151018_2024.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0006_auto_20151015_1202'), - ] - - operations = [ - migrations.AlterField( - model_name='assessment', - name='current', - field=models.BooleanField(default=False, verbose_name='Basis for risk rating'), - preserve_default=True, - ), - migrations.AlterField( - model_name='assessment', - name='expected_budget', - field=models.IntegerField(null=True, verbose_name='Planned amount', blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='assessment', - name='partner', - field=models.ForeignKey(related_name='assessments', to='partners.PartnerOrganization'), - preserve_default=True, - ), - migrations.AlterField( - model_name='assessment', - name='requesting_officer', - field=models.ForeignKey(related_name='requested_assessments', blank=True, to=settings.AUTH_USER_MODEL, null=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='partnerorganization', - name='type', - field=models.CharField(blank=True, max_length=50, verbose_name='CSO Type', choices=[('International NGO', 'International NGO'), ('National NGO', 'National NGO'), ('CBO', 'CBO'), ('Academic Institution', 'Academic Institution')]), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0008_auto_20151018_2238.py b/EquiTrack/partners/migrations/0008_auto_20151018_2238.py deleted file mode 100644 index ed1a52844f..0000000000 --- a/EquiTrack/partners/migrations/0008_auto_20151018_2238.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0007_auto_20151018_2024'), - ] - - operations = [ - migrations.AlterField( - model_name='agreement', - name='end', - field=models.DateField(null=True, blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='agreement', - name='start', - field=models.DateField(null=True, blank=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0009_auto_20151022_1216.py b/EquiTrack/partners/migrations/0009_auto_20151022_1216.py deleted file mode 100644 index 9ad55964eb..0000000000 --- a/EquiTrack/partners/migrations/0009_auto_20151022_1216.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0008_auto_20151018_2238'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='type', - field=models.CharField(blank=True, max_length=50, null=True, verbose_name='CSO Type', choices=[('International NGO', 'International NGO'), ('National NGO', 'National NGO'), ('CBO', 'CBO'), ('Academic Institution', 'Academic Institution')]), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0010_auto_20151027_1852.py b/EquiTrack/partners/migrations/0010_auto_20151027_1852.py deleted file mode 100644 index 0cbecebf0a..0000000000 --- a/EquiTrack/partners/migrations/0010_auto_20151027_1852.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0009_auto_20151022_1216'), - ] - - operations = [ - migrations.AlterField( - model_name='pca', - name='partnership_type', - field=models.CharField(default='pd', choices=[('pd', 'Programme Document'), ('shpd', 'Simplified Humanitarian Programme Document'), ('dct', 'Cash Transfers to Government'), ('ssfa', 'SSFA ToR')], max_length=255, blank=True, null=True, verbose_name='Document type'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0011_auto_20151102_2052.py b/EquiTrack/partners/migrations/0011_auto_20151102_2052.py deleted file mode 100644 index 47ef994f22..0000000000 --- a/EquiTrack/partners/migrations/0011_auto_20151102_2052.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0010_auto_20151027_1852'), - ] - - operations = [ - migrations.AddField( - model_name='amendmentlog', - name='status', - field=models.CharField(blank=True, max_length=32L, choices=[('in_process', 'In Process'), ('active', 'Active'), ('implemented', 'Implemented'), ('cancelled', 'Cancelled')]), - preserve_default=True, - ), - migrations.AlterField( - model_name='amendmentlog', - name='amended_at', - field=models.DateField(null=True, verbose_name=b'Signed At'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0012_auto_20151109_1503.py b/EquiTrack/partners/migrations/0012_auto_20151109_1503.py deleted file mode 100644 index 59e51f3cc1..0000000000 --- a/EquiTrack/partners/migrations/0012_auto_20151109_1503.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0011_auto_20151102_2052'), - ] - - operations = [ - migrations.AlterField( - model_name='pca', - name='partnership_type', - field=models.CharField(default='pd', choices=[('pd', 'Programme Document'), ('shpd', 'Simplified Humanitarian Programme Document'), ('dct', 'Cash Transfers to Government'), ('ssfa', 'SSFA TOR'), ('ic', 'IC TOR')], max_length=255, blank=True, null=True, verbose_name='Document type'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0013_auto_20151118_1151.py b/EquiTrack/partners/migrations/0013_auto_20151118_1151.py deleted file mode 100644 index 7f4c22bc2a..0000000000 --- a/EquiTrack/partners/migrations/0013_auto_20151118_1151.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -import filer.fields.file -import partners.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0012_auto_20151109_1503'), - ] - - operations = [ - migrations.AddField( - model_name='pcafile', - name='attachment', - field=models.FileField(default='', max_length=255, upload_to=partners.models.get_file_path), - preserve_default=False, - ), - migrations.AlterField( - model_name='pcafile', - name='file', - field=filer.fields.file.FilerFileField(blank=True, to='filer.File', null=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='pcafile', - name='pca', - field=models.ForeignKey(related_name='attachments', to='partners.PCA'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0014_auto_20151119_1310.py b/EquiTrack/partners/migrations/0014_auto_20151119_1310.py deleted file mode 100644 index ca5ecdf9ab..0000000000 --- a/EquiTrack/partners/migrations/0014_auto_20151119_1310.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0013_auto_20151118_1151'), - ] - - operations = [ - migrations.AlterField( - model_name='agreement', - name='agreement_type', - field=models.CharField(max_length=10, choices=[('PCA', 'Programme Cooperation Agreement'), ('SSFA', 'Small Scale Funding Agreement'), ('MOU', 'Memorandum of Understanding'), ('IC', 'Institutional Contract'), ('AWP', 'Work Plan')]), - preserve_default=True, - ), - migrations.AlterField( - model_name='pca', - name='partnership_type', - field=models.CharField(default='PD', choices=[('PD', 'Programme Document'), ('SHPD', 'Simplified Humanitarian Programme Document'), ('AWP', 'Cash Transfers to Government'), ('SSFA', 'SSFA TOR'), ('IC', 'IC TOR')], max_length=255, blank=True, null=True, verbose_name='Document type'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0015_auto_20151120_1817.py b/EquiTrack/partners/migrations/0015_auto_20151120_1817.py deleted file mode 100644 index c800a4f886..0000000000 --- a/EquiTrack/partners/migrations/0015_auto_20151120_1817.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0014_auto_20151119_1310'), - ] - - operations = [ - migrations.AddField( - model_name='resultchain', - name='code', - field=models.CharField(max_length=50, null=True, blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='resultchain', - name='in_kind_amount', - field=models.IntegerField(default=0), - preserve_default=True, - ), - migrations.AddField( - model_name='resultchain', - name='partner_contribution', - field=models.IntegerField(default=0), - preserve_default=True, - ), - migrations.AddField( - model_name='resultchain', - name='unicef_cash', - field=models.IntegerField(default=0), - preserve_default=True, - ), - ] diff --git a/EquiTrack/partners/migrations/0016_auto_20151126_1702.py b/EquiTrack/partners/migrations/0016_auto_20151126_1702.py deleted file mode 100644 index 365b4346a8..0000000000 --- a/EquiTrack/partners/migrations/0016_auto_20151126_1702.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django.contrib.postgres.fields.hstore -from django.contrib.postgres.operations import HStoreExtension - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0015_auto_20151120_1817'), - ] - - operations = [ - HStoreExtension(), - migrations.RemoveField( - model_name='resultchain', - name='governorate', - ), - migrations.AddField( - model_name='resultchain', - name='disaggregation', - field=django.contrib.postgres.fields.hstore.HStoreField(null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0017_auto_20151203_1758.py b/EquiTrack/partners/migrations/0017_auto_20151203_1758.py deleted file mode 100644 index 7dbcdcfaf5..0000000000 --- a/EquiTrack/partners/migrations/0017_auto_20151203_1758.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import smart_selects.db_fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0016_auto_20151126_1702'), - ] - - operations = [ - migrations.AlterField( - model_name='pca', - name='agreement', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'partner', related_name='interventions', chained_field=b'partner', blank=True, auto_choose=True, to='partners.Agreement', null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0018_auto_20151211_1528.py b/EquiTrack/partners/migrations/0018_auto_20151211_1528.py deleted file mode 100644 index 1fa23df1fc..0000000000 --- a/EquiTrack/partners/migrations/0018_auto_20151211_1528.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0017_auto_20151203_1758'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerstaffmember', - name='email', - field=models.CharField(unique=True, max_length=128L), - ), - ] diff --git a/EquiTrack/partners/migrations/0019_auto_20160113_1554.py b/EquiTrack/partners/migrations/0019_auto_20160113_1554.py deleted file mode 100644 index 0d7b52269d..0000000000 --- a/EquiTrack/partners/migrations/0019_auto_20160113_1554.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0018_auto_20151211_1528'), - ] - - operations = [ - migrations.AlterField( - model_name='gwpcalocation', - name='locality', - field=models.ForeignKey(blank=True, to='locations.Locality', null=True), - ), - migrations.AlterField( - model_name='gwpcalocation', - name='location', - field=models.ForeignKey(blank=True, to='locations.Location', null=True), - ), - migrations.AlterField( - model_name='gwpcalocation', - name='region', - field=models.ForeignKey(to='locations.Region'), - ), - migrations.AlterField( - model_name='resultchain', - name='indicator', - field=models.ForeignKey(blank=True, to='reports.Indicator', null=True), - ), - migrations.AlterField( - model_name='resultchain', - name='result', - field=models.ForeignKey(to='reports.Result'), - ), - ] diff --git a/EquiTrack/partners/migrations/0020_auto_20160127_1751.py b/EquiTrack/partners/migrations/0020_auto_20160127_1751.py deleted file mode 100644 index 36d848d130..0000000000 --- a/EquiTrack/partners/migrations/0020_auto_20160127_1751.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0019_auto_20160113_1554'), - ] - - operations = [ - migrations.AlterField( - model_name='gwpcalocation', - name='governorate', - field=models.ForeignKey(blank=True, to='locations.Governorate', null=True), - ), - migrations.AlterField( - model_name='gwpcalocation', - name='region', - field=models.ForeignKey(blank=True, to='locations.Region', null=True), - ), - migrations.AlterField( - model_name='pca', - name='end_date', - field=models.DateField(help_text='The date the Intervention will end', null=True, blank=True), - ), - migrations.AlterField( - model_name='pca', - name='start_date', - field=models.DateField(help_text='The date the Intervention will start', null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0021_partnerstaffmember_active.py b/EquiTrack/partners/migrations/0021_partnerstaffmember_active.py deleted file mode 100644 index c0a871e1df..0000000000 --- a/EquiTrack/partners/migrations/0021_partnerstaffmember_active.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0020_auto_20160127_1751'), - ] - - operations = [ - migrations.AddField( - model_name='partnerstaffmember', - name='active', - field=models.BooleanField(default=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0022_auto_20160223_2222.py b/EquiTrack/partners/migrations/0022_auto_20160223_2222.py deleted file mode 100644 index fe30efe5be..0000000000 --- a/EquiTrack/partners/migrations/0022_auto_20160223_2222.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-23 20:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0021_partnerstaffmember_active'), - ] - - operations = [ - migrations.AddField( - model_name='agreement', - name='account_number', - field=models.CharField(blank=True, max_length=50, null=True), - ), - migrations.AddField( - model_name='agreement', - name='account_title', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='agreement', - name='bank_address', - field=models.CharField(blank=True, max_length=256L), - ), - migrations.AddField( - model_name='agreement', - name='bank_contact_person', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='agreement', - name='bank_name', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='agreement', - name='routing_details', - field=models.CharField(blank=True, help_text=b'Routing Details, including SWIFT/IBAN (if applicable)', max_length=255, null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0023_auto_20160228_0002.py b/EquiTrack/partners/migrations/0023_auto_20160228_0002.py deleted file mode 100644 index c6f3449bab..0000000000 --- a/EquiTrack/partners/migrations/0023_auto_20160228_0002.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('funds', '0002_grant_expiry'), - ('partners', '0022_auto_20160223_2222'), - ] - - operations = [ - migrations.CreateModel( - name='DirectCashTransfer', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('fc_ref', models.CharField(max_length=50)), - ('amount_usd', models.DecimalField(max_digits=10, decimal_places=2)), - ('liquidation_usd', models.DecimalField(max_digits=10, decimal_places=2)), - ('outstanding_balance_usd', models.DecimalField(max_digits=10, decimal_places=2)), - ('amount_less_than_3_Months_usd', models.DecimalField(max_digits=10, decimal_places=2)), - ('amount_3_to_6_months_usd', models.DecimalField(max_digits=10, decimal_places=2)), - ('amount_6_to_9_months_usd', models.DecimalField(max_digits=10, decimal_places=2)), - ('amount_more_than_9_Months_usd', models.DecimalField(max_digits=10, decimal_places=2)), - ], - ), - migrations.CreateModel( - name='FundingCommitment', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('fr_number', models.CharField(max_length=50)), - ('wbs', models.CharField(max_length=50)), - ('fc_type', models.CharField(max_length=50)), - ('fc_ref', models.CharField(max_length=50)), - ('fr_item_amount_usd', models.DecimalField(max_digits=10, decimal_places=2)), - ('agreement_amount', models.DecimalField(max_digits=10, decimal_places=2)), - ('commitment_amount', models.DecimalField(max_digits=10, decimal_places=2)), - ('expenditure_amount', models.DecimalField(max_digits=10, decimal_places=2)), - ('grant', models.ForeignKey(to='funds.Grant')), - ], - ), - migrations.AlterModelOptions( - name='pca', - options={'ordering': ['-created_at'], 'verbose_name': 'Intervention', 'verbose_name_plural': 'Interventions'}, - ), - migrations.RemoveField( - model_name='partnerorganization', - name='type', - ), - migrations.AddField( - model_name='partnerorganization', - name='cso_type', - field=models.CharField(blank=True, max_length=50, null=True, verbose_name='CSO Type', choices=[('International', 'International'), ('National', 'National'), ('Community Based Organisation', 'Community Based Organisation'), ('Academic Institution', 'Academic Institution')]), - ), - migrations.AddField( - model_name='partnerorganization', - name='vision_synced', - field=models.BooleanField(default=False), - ), - migrations.AlterField( - model_name='partnerorganization', - name='partner_type', - field=models.CharField(max_length=50, choices=[('Bilateral / Multilateral', 'Bilateral / Multilateral'), ('Civil Society Organization', 'Civil Society Organization'), ('Government', 'Government'), ('UN Agency', 'UN Agency')]), - ), - migrations.AddField( - model_name='fundingcommitment', - name='intervention', - field=models.ForeignKey(to='partners.PCA', null=True), - ), - migrations.AddField( - model_name='pca', - name='fr_number', - field=models.CharField(max_length=50, null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0024_indicatorreport.py b/EquiTrack/partners/migrations/0024_indicatorreport.py deleted file mode 100644 index 0e39ed5a17..0000000000 --- a/EquiTrack/partners/migrations/0024_indicatorreport.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-23 16:55 -from __future__ import unicode_literals - -from jsonfield import JSONField -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import model_utils.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0012_auto_20160222_1652'), - ('locations', '0004_auto_20160222_1652'), - ('partners', '0023_auto_20160228_0002'), - ] - - operations = [ - migrations.CreateModel( - name='IndicatorReport', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), - ('total', models.PositiveIntegerField()), - ('disaggregated', models.BooleanField(default=False)), - ('disaggregation', JSONField(default=dict)), - ('from_date', models.DateTimeField()), - ('to_date', models.DateTimeField()), - ('remarks', models.TextField(blank=True, null=True)), - ('indicator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reports', to='reports.Indicator')), - ('location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location')), - ('partner_staff_member', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='indicator_reports', to='partners.PartnerStaffMember')), - ('result_chain', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='indicator_reports', to='partners.ResultChain')), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/EquiTrack/partners/migrations/0025_auto_20160229_1333.py b/EquiTrack/partners/migrations/0025_auto_20160229_1333.py deleted file mode 100644 index 8e2430a882..0000000000 --- a/EquiTrack/partners/migrations/0025_auto_20160229_1333.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0024_indicatorreport'), - ] - - operations = [ - migrations.AlterField( - model_name='fundingcommitment', - name='fc_ref', - field=models.CharField(max_length=50, null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0026_auto_20160229_1545.py b/EquiTrack/partners/migrations/0026_auto_20160229_1545.py deleted file mode 100644 index a184a49ff5..0000000000 --- a/EquiTrack/partners/migrations/0026_auto_20160229_1545.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0025_auto_20160229_1333'), - ] - - operations = [ - migrations.AlterField( - model_name='fundingcommitment', - name='agreement_amount', - field=models.DecimalField(null=True, max_digits=10, decimal_places=2, blank=True), - ), - migrations.AlterField( - model_name='fundingcommitment', - name='commitment_amount', - field=models.DecimalField(null=True, max_digits=10, decimal_places=2, blank=True), - ), - migrations.AlterField( - model_name='fundingcommitment', - name='expenditure_amount', - field=models.DecimalField(null=True, max_digits=10, decimal_places=2, blank=True), - ), - migrations.AlterField( - model_name='fundingcommitment', - name='fr_item_amount_usd', - field=models.DecimalField(null=True, max_digits=10, decimal_places=2, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0027_resultchain_current_progress.py b/EquiTrack/partners/migrations/0027_resultchain_current_progress.py deleted file mode 100644 index 563ae8e097..0000000000 --- a/EquiTrack/partners/migrations/0027_resultchain_current_progress.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-23 17:55 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0026_auto_20160229_1545'), - ] - - operations = [ - migrations.AddField( - model_name='resultchain', - name='current_progress', - field=models.PositiveIntegerField(default=0), - ), - ] diff --git a/EquiTrack/partners/migrations/0028_auto_20160304_1840.py b/EquiTrack/partners/migrations/0028_auto_20160304_1840.py deleted file mode 100644 index ce543a1ebe..0000000000 --- a/EquiTrack/partners/migrations/0028_auto_20160304_1840.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0027_resultchain_current_progress'), - ] - - operations = [ - migrations.RemoveField( - model_name='indicatorprogress', - name='indicator', - ), - migrations.RemoveField( - model_name='indicatorprogress', - name='pca_sector', - ), - migrations.RemoveField( - model_name='indicatorreport', - name='from_date', - ), - migrations.RemoveField( - model_name='indicatorreport', - name='to_date', - ), - migrations.AddField( - model_name='indicatorreport', - name='end', - field=models.DateTimeField(null=True, verbose_name='end', blank=True), - ), - migrations.AddField( - model_name='indicatorreport', - name='start', - field=models.DateTimeField(null=True, verbose_name='start', blank=True), - ), - migrations.DeleteModel( - name='IndicatorProgress', - ), - ] diff --git a/EquiTrack/partners/migrations/0029_auto_20160308_0142.py b/EquiTrack/partners/migrations/0029_auto_20160308_0142.py deleted file mode 100644 index a302f933e3..0000000000 --- a/EquiTrack/partners/migrations/0029_auto_20160308_0142.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0028_auto_20160304_1840'), - ] - - operations = [ - migrations.AlterField( - model_name='agreement', - name='agreement_number', - field=models.CharField(help_text='Reference Number', max_length=45L, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0030_auto_20160313_0006.py b/EquiTrack/partners/migrations/0030_auto_20160313_0006.py deleted file mode 100644 index f5b573f649..0000000000 --- a/EquiTrack/partners/migrations/0030_auto_20160313_0006.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0029_auto_20160308_0142'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='rating', - field=models.CharField(default='High', max_length=50, verbose_name='Risk Rating'), - ), - ] diff --git a/EquiTrack/partners/migrations/0031_auto_20160313_1241.py b/EquiTrack/partners/migrations/0031_auto_20160313_1241.py deleted file mode 100644 index 2a64593115..0000000000 --- a/EquiTrack/partners/migrations/0031_auto_20160313_1241.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0030_auto_20160313_0006'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='rating', - field=models.CharField(default='High', max_length=50, null=True, verbose_name='Risk Rating'), - ), - ] diff --git a/EquiTrack/partners/migrations/0032_pca_project_type.py b/EquiTrack/partners/migrations/0032_pca_project_type.py deleted file mode 100644 index 8eba07dabe..0000000000 --- a/EquiTrack/partners/migrations/0032_pca_project_type.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0031_auto_20160313_1241'), - ] - - operations = [ - migrations.AddField( - model_name='pca', - name='project_type', - field=models.CharField(blank=True, max_length=20, null=True, choices=[('Bulk Procurement', 'Bulk Procurement'), ('Construction Project', 'Construction Project')]), - ), - ] diff --git a/EquiTrack/partners/migrations/0033_auto_20160313_2153.py b/EquiTrack/partners/migrations/0033_auto_20160313_2153.py deleted file mode 100644 index 0277fed210..0000000000 --- a/EquiTrack/partners/migrations/0033_auto_20160313_2153.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0032_pca_project_type'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='rating', - field=models.CharField(max_length=50, null=True, verbose_name='Risk Rating'), - ), - ] diff --git a/EquiTrack/partners/migrations/0034_ramindicator.py b/EquiTrack/partners/migrations/0034_ramindicator.py deleted file mode 100644 index 30a1aa751f..0000000000 --- a/EquiTrack/partners/migrations/0034_ramindicator.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import smart_selects.db_fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0014_auto_20160314_0319'), - ('partners', '0033_auto_20160313_2153'), - ] - - operations = [ - migrations.CreateModel( - name='RAMIndicator', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('indicator', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'result', to='reports.Indicator', chained_field=b'result', auto_choose=True)), - ('intervention', models.ForeignKey(related_name='indicators', to='partners.PCA')), - ('result', models.ForeignKey(to='reports.Result')), - ], - ), - ] diff --git a/EquiTrack/partners/migrations/0035_auto_20160314_1524.py b/EquiTrack/partners/migrations/0035_auto_20160314_1524.py deleted file mode 100644 index 91b2cc8ad7..0000000000 --- a/EquiTrack/partners/migrations/0035_auto_20160314_1524.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0034_ramindicator'), - ] - - operations = [ - migrations.AddField( - model_name='ramindicator', - name='baseline', - field=models.CharField(max_length=255, null=True, blank=True), - ), - migrations.AddField( - model_name='ramindicator', - name='target', - field=models.CharField(max_length=255, null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0036_auto_20160328_0122.py b/EquiTrack/partners/migrations/0036_auto_20160328_0122.py deleted file mode 100644 index 4881287bd1..0000000000 --- a/EquiTrack/partners/migrations/0036_auto_20160328_0122.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0035_auto_20160314_1524'), - ] - - operations = [ - migrations.AddField( - model_name='fundingcommitment', - name='end', - field=models.DateTimeField(null=True, verbose_name='end', blank=True), - ), - migrations.AddField( - model_name='fundingcommitment', - name='start', - field=models.DateTimeField(null=True, verbose_name='start', blank=True), - ), - migrations.AlterField( - model_name='fundingcommitment', - name='intervention', - field=models.ForeignKey(related_name='funding_commitments', to='partners.PCA', null=True), - ), - migrations.AlterField( - model_name='pca', - name='partner', - field=models.ForeignKey(related_name='documents', to='partners.PartnerOrganization'), - ), - migrations.AlterField( - model_name='resultchain', - name='disaggregation', - field=jsonfield.fields.JSONField(null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0037_auto_20160329_0220.py b/EquiTrack/partners/migrations/0037_auto_20160329_0220.py deleted file mode 100644 index 9fa036be62..0000000000 --- a/EquiTrack/partners/migrations/0037_auto_20160329_0220.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone -import model_utils.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0036_auto_20160328_0122'), - ] - - operations = [ - migrations.CreateModel( - name='AgreementAmendmentLog', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), - ('type', models.CharField(max_length=50, choices=[(b'Authorised Officers', b'Authorised Officers'), (b'Banking Info', b'Banking Info'), (b'Agreement Changes', b'Agreement Changes'), (b'Additional Clauses', b'Additional Clauses')])), - ('amended_at', models.DateField(null=True, verbose_name=b'Signed At')), - ('status', models.CharField(blank=True, max_length=32L, choices=[('in_process', 'In Process'), ('active', 'Active'), ('implemented', 'Implemented'), ('cancelled', 'Cancelled')])), - ('agreement', models.ForeignKey(related_name='amendments_log', to='partners.Agreement')), - ], - options={ - 'abstract': False, - }, - ), - migrations.RemoveField( - model_name='amendmentlog', - name='amendment_number', - ), - ] diff --git a/EquiTrack/partners/migrations/0038_auto_20160404_1519.py b/EquiTrack/partners/migrations/0038_auto_20160404_1519.py deleted file mode 100644 index 40f89ab35d..0000000000 --- a/EquiTrack/partners/migrations/0038_auto_20160404_1519.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import partners.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('locations', '0006_auto_20160229_1545'), - ('partners', '0037_auto_20160329_0220'), - ] - - operations = [ - migrations.RemoveField( - model_name='distributionplan', - name='location', - ), - migrations.AddField( - model_name='distributionplan', - name='site', - field=models.ForeignKey(to='locations.Location', null=True), - ), - migrations.AlterField( - model_name='agreement', - name='attached_agreement', - field=models.FileField(upload_to=partners.models.get_agreement_path, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0039_distributionplan_document.py b/EquiTrack/partners/migrations/0039_distributionplan_document.py deleted file mode 100644 index ca37646f1c..0000000000 --- a/EquiTrack/partners/migrations/0039_distributionplan_document.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0038_auto_20160404_1519'), - ] - - operations = [ - migrations.AddField( - model_name='distributionplan', - name='document', - field=jsonfield.fields.JSONField(null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0040_auto_20160411_1404.py b/EquiTrack/partners/migrations/0040_auto_20160411_1404.py deleted file mode 100644 index ccf1aafa0b..0000000000 --- a/EquiTrack/partners/migrations/0040_auto_20160411_1404.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0039_distributionplan_document'), - ] - - operations = [ - migrations.AddField( - model_name='partnerorganization', - name='type_of_assessment', - field=models.CharField(max_length=50, null=True), - ), - migrations.AlterField( - model_name='assessment', - name='rating', - field=models.CharField(default='high', max_length=50, choices=[('high', 'High'), ('significant', 'Significant'), ('medium', 'Medium'), ('low', 'Low')]), - ), - migrations.AlterField( - model_name='distributionplan', - name='document', - field=jsonfield.fields.JSONField(null=True, blank=True), - ), - migrations.AlterField( - model_name='recommendation', - name='level', - field=models.CharField(max_length=50, verbose_name='Priority Flag', choices=[('high', 'High'), ('significant', 'Significant'), ('medium', 'Medium'), ('low', 'Low')]), - ), - ] diff --git a/EquiTrack/partners/migrations/0041_auto_20160413_0051.py b/EquiTrack/partners/migrations/0041_auto_20160413_0051.py deleted file mode 100644 index b361850f3b..0000000000 --- a/EquiTrack/partners/migrations/0041_auto_20160413_0051.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0040_auto_20160411_1404'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='name', - field=models.CharField(help_text='Please make sure this matches the name you enter in VISION', max_length=255, verbose_name=b'Full Name'), - ), - migrations.AlterUniqueTogether( - name='partnerorganization', - unique_together=set([('name', 'vendor_number')]), - ), - ] diff --git a/EquiTrack/partners/migrations/0042_auto_20160413_1321.py b/EquiTrack/partners/migrations/0042_auto_20160413_1321.py deleted file mode 100644 index 139a2fdd5d..0000000000 --- a/EquiTrack/partners/migrations/0042_auto_20160413_1321.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0041_auto_20160413_0051'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='vendor_number', - field=models.BigIntegerField(unique=True, null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0043_auto_20160413_1358.py b/EquiTrack/partners/migrations/0043_auto_20160413_1358.py deleted file mode 100644 index e974927c9c..0000000000 --- a/EquiTrack/partners/migrations/0043_auto_20160413_1358.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0042_auto_20160413_1321'), - ] - - operations = [ - migrations.AlterField( - model_name='pca', - name='number', - field=models.CharField(help_text='Document Reference Number', max_length=45L, null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0044_pca_planned_visits.py b/EquiTrack/partners/migrations/0044_pca_planned_visits.py deleted file mode 100644 index 09636edfd7..0000000000 --- a/EquiTrack/partners/migrations/0044_pca_planned_visits.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0043_auto_20160413_1358'), - ] - - operations = [ - migrations.AddField( - model_name='pca', - name='planned_visits', - field=models.IntegerField(default=0), - ), - ] diff --git a/EquiTrack/partners/migrations/0045_remove_pcafile_file.py b/EquiTrack/partners/migrations/0045_remove_pcafile_file.py deleted file mode 100644 index d74c65cb67..0000000000 --- a/EquiTrack/partners/migrations/0045_remove_pcafile_file.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0044_pca_planned_visits'), - ] - - operations = [ - migrations.RemoveField( - model_name='pcafile', - name='file', - ), - ] diff --git a/EquiTrack/partners/migrations/0046_auto_20160426_1521.py b/EquiTrack/partners/migrations/0046_auto_20160426_1521.py deleted file mode 100644 index 6cabbabb09..0000000000 --- a/EquiTrack/partners/migrations/0046_auto_20160426_1521.py +++ /dev/null @@ -1,111 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0012_country_vision_last_synced'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('reports', '0016_auto_20160323_1933'), - ('partners', '0045_remove_pcafile_file'), - ] - - operations = [ - migrations.CreateModel( - name='GovernmentIntervention', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('partner', models.ForeignKey(related_name='work_plans', to='partners.PartnerOrganization')), - ('result_structure', models.ForeignKey(help_text='Which result structure does this partnership report under?', to='reports.ResultStructure')), - ], - ), - migrations.CreateModel( - name='GovernmentInterventionResult', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('year', models.CharField(max_length=4)), - ('planned_amount', models.IntegerField(default=0, verbose_name=b'Planned Cash Transfers')), - ('activities', models.TextField()), - ('intervention', models.ForeignKey(related_name='results', to='partners.GovernmentIntervention')), - ('result', models.ForeignKey(to='reports.Result')), - ('section', models.ForeignKey(blank=True, to='users.Section', null=True)), - ('sector', models.ForeignKey(verbose_name=b'Programme/Sector', blank=True, to='reports.Sector', null=True)), - ('unicef_managers', models.ManyToManyField(to=settings.AUTH_USER_MODEL, verbose_name=b'Unicef focal points', blank=True)), - ], - ), - migrations.RemoveField( - model_name='recommendation', - name='assessment', - ), - migrations.RemoveField( - model_name='pca', - name='amended_at', - ), - migrations.RemoveField( - model_name='pca', - name='amendment', - ), - migrations.RemoveField( - model_name='pca', - name='amendment_number', - ), - migrations.RemoveField( - model_name='pca', - name='cash_for_supply_budget', - ), - migrations.RemoveField( - model_name='pca', - name='in_kind_amount_budget', - ), - migrations.RemoveField( - model_name='pca', - name='original', - ), - migrations.RemoveField( - model_name='pca', - name='partner_contribution_budget', - ), - migrations.RemoveField( - model_name='pca', - name='partner_mng_email', - ), - migrations.RemoveField( - model_name='pca', - name='partner_mng_first_name', - ), - migrations.RemoveField( - model_name='pca', - name='partner_mng_last_name', - ), - migrations.RemoveField( - model_name='pca', - name='partner_mng_phone', - ), - migrations.RemoveField( - model_name='pca', - name='total_cash', - ), - migrations.RemoveField( - model_name='pca', - name='unicef_cash_budget', - ), - migrations.RemoveField( - model_name='pca', - name='unicef_mng_email', - ), - migrations.RemoveField( - model_name='pca', - name='unicef_mng_first_name', - ), - migrations.RemoveField( - model_name='pca', - name='unicef_mng_last_name', - ), - migrations.DeleteModel( - name='Recommendation', - ), - ] diff --git a/EquiTrack/partners/migrations/0047_auto_20160427_2035.py b/EquiTrack/partners/migrations/0047_auto_20160427_2035.py deleted file mode 100644 index c9b2c69191..0000000000 --- a/EquiTrack/partners/migrations/0047_auto_20160427_2035.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0046_auto_20160426_1521'), - ] - - operations = [ - migrations.AddField( - model_name='partnerorganization', - name='last_assessment_date', - field=models.DateField(null=True, blank=True), - ), - migrations.AlterField( - model_name='assessment', - name='type', - field=models.CharField(max_length=50, choices=[('Micro Assessment', 'Micro Assessment'), ('Simplified Checklist', 'Simplified Checklist'), ('Scheduled Audit report', 'Scheduled Audit report'), ('Special Audit report', 'Special Audit report'), ('High Risk Assumed', 'High Risk Assumed'), ('Other', 'Other')]), - ), - ] diff --git a/EquiTrack/partners/migrations/0048_indicatorduedates.py b/EquiTrack/partners/migrations/0048_indicatorduedates.py deleted file mode 100644 index d1fab6bd53..0000000000 --- a/EquiTrack/partners/migrations/0048_indicatorduedates.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0047_auto_20160427_2035'), - ] - - operations = [ - migrations.CreateModel( - name='IndicatorDueDates', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('due_date', models.DateField(null=True, blank=True)), - ('intervention', models.ForeignKey(related_name='indicator_due_dates', blank=True, to='partners.PCA', null=True)), - ], - options={'ordering': ['-due_date'], 'verbose_name': 'Indicator Due Date', 'verbose_name_plural': 'Indicator Due Dates'}, - ), - ] diff --git a/EquiTrack/partners/migrations/0049_auto_20160428_0213.py b/EquiTrack/partners/migrations/0049_auto_20160428_0213.py deleted file mode 100644 index 33cb1a54b4..0000000000 --- a/EquiTrack/partners/migrations/0049_auto_20160428_0213.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django_hstore.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0048_indicatorduedates'), - ] - - operations = [ - migrations.AlterModelOptions( - name='indicatorduedates', - options={'ordering': ['-due_date'], 'verbose_name': 'Report Due Date', 'verbose_name_plural': 'Report Due Dates'}, - ), - migrations.AlterField( - model_name='governmentintervention', - name='result_structure', - field=models.ForeignKey(to='reports.ResultStructure'), - ), - migrations.RemoveField( - model_name='governmentinterventionresult', - name='activities', - ), - migrations.AddField( - model_name='governmentinterventionresult', - name='activities', - field=django_hstore.fields.DictionaryField(null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0050_partnerorganization_shared_partner.py b/EquiTrack/partners/migrations/0050_partnerorganization_shared_partner.py deleted file mode 100644 index ac4e96d3f6..0000000000 --- a/EquiTrack/partners/migrations/0050_partnerorganization_shared_partner.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0049_auto_20160428_0213'), - ] - - operations = [ - migrations.AddField( - model_name='partnerorganization', - name='shared_partner', - field=models.CharField(default='No', help_text='Partner shared with UNDP or UNFPA?', max_length=50, choices=[('No', 'No'), ('with UNDP', 'with UNDP'), ('with UNFPA', 'with UNFPA'), ('with UNDP & UNFPA', 'with UNDP & UNFPA')]), - ), - ] diff --git a/EquiTrack/partners/migrations/0051_auto_20160505_1740.py b/EquiTrack/partners/migrations/0051_auto_20160505_1740.py deleted file mode 100644 index e05d034943..0000000000 --- a/EquiTrack/partners/migrations/0051_auto_20160505_1740.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0050_partnerorganization_shared_partner'), - ] - - operations = [ - migrations.AlterField( - model_name='resultchain', - name='disaggregation', - field=models.TextField(null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0052_convert_disaggregation_to_json.py b/EquiTrack/partners/migrations/0052_convert_disaggregation_to_json.py deleted file mode 100644 index 0d47634383..0000000000 --- a/EquiTrack/partners/migrations/0052_convert_disaggregation_to_json.py +++ /dev/null @@ -1,42 +0,0 @@ -from __future__ import unicode_literals - -from django.db import models, migrations - - -def updateResultChain(apps, schema_editor): - """ - Make sure every user has their own countries available - """ - - ResultChain = apps.get_model("partners", "ResultChain") - - for rc in ResultChain.objects.all(): - - if rc.disaggregation is not None: - if rc.disaggregation[0] != '{': - rc.disaggregation = '{' + rc.disaggregation.replace('=>', ':') + '}' - - rc.save() - - -def revert(apps, schema_editor): - - ResultChain = apps.get_model("partners", "ResultChain") - - for rc in ResultChain.objects.all(): - if rc.disaggregation == '{}': - rc.disaggregation = None - if rc.disaggregation is not None: - rc.disaggregation = rc.disaggregation[1:-1] - rc.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0051_auto_20160505_1740'), - ] - - operations = [ - migrations.RunPython(updateResultChain, reverse_code=revert), - ] diff --git a/EquiTrack/partners/migrations/0053_auto_20160505_1810.py b/EquiTrack/partners/migrations/0053_auto_20160505_1810.py deleted file mode 100644 index 5bcd32e176..0000000000 --- a/EquiTrack/partners/migrations/0053_auto_20160505_1810.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0052_convert_disaggregation_to_json'), - ] - - operations = [ - migrations.AddField( - model_name='indicatorreport', - name='report_status', - field=models.CharField(default=b'ontrack', max_length=15, choices=[(b'ontrack', b'On Track'), (b'constrained', b'Constrained'), (b'noprogress', b'No Progress'), (b'targetmet', b'Target Met')]), - ), - migrations.AlterField( - model_name='resultchain', - name='disaggregation', - field=jsonfield.fields.JSONField(null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0054_bankdetails.py b/EquiTrack/partners/migrations/0054_bankdetails.py deleted file mode 100644 index 92c67bcb94..0000000000 --- a/EquiTrack/partners/migrations/0054_bankdetails.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0053_auto_20160505_1810'), - ] - - operations = [ - migrations.CreateModel( - name='BankDetails', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('bank_name', models.CharField(max_length=255, null=True, blank=True)), - ('bank_address', models.CharField(max_length=256L, blank=True)), - ('account_title', models.CharField(max_length=255, null=True, blank=True)), - ('account_number', models.CharField(max_length=50, null=True, blank=True)), - ('routing_details', models.CharField(help_text=b'Routing Details, including SWIFT/IBAN (if applicable)', max_length=255, null=True, blank=True)), - ('bank_contact_person', models.CharField(max_length=255, null=True, blank=True)), - ('agreement', models.ForeignKey(related_name='bank_details', to='partners.Agreement')), - ], - ), - ] diff --git a/EquiTrack/partners/migrations/0055_auto_20160509_0934.py b/EquiTrack/partners/migrations/0055_auto_20160509_0934.py deleted file mode 100644 index 98408cf71a..0000000000 --- a/EquiTrack/partners/migrations/0055_auto_20160509_0934.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0054_bankdetails'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='email', - field=models.CharField(max_length=255, null=True, blank=True), - ), - migrations.AlterField( - model_name='partnerorganization', - name='phone_number', - field=models.CharField(max_length=32L, null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0056_auto_20160509_1330.py b/EquiTrack/partners/migrations/0056_auto_20160509_1330.py deleted file mode 100644 index d9620aedca..0000000000 --- a/EquiTrack/partners/migrations/0056_auto_20160509_1330.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0055_auto_20160509_0934'), - ] - - operations = [ - migrations.AddField( - model_name='authorizedofficer', - name='amendment', - field=models.ForeignKey(blank=True, to='partners.AgreementAmendmentLog', null=True), - ), - migrations.AddField( - model_name='bankdetails', - name='amendment', - field=models.ForeignKey(blank=True, to='partners.AgreementAmendmentLog', null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0057_auto_20160509_1827.py b/EquiTrack/partners/migrations/0057_auto_20160509_1827.py deleted file mode 100644 index 4fb33128d4..0000000000 --- a/EquiTrack/partners/migrations/0057_auto_20160509_1827.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0056_auto_20160509_1330'), - ] - - operations = [ - migrations.RemoveField( - model_name='ramindicator', - name='baseline', - ), - migrations.RemoveField( - model_name='ramindicator', - name='target', - ), - ] diff --git a/EquiTrack/partners/migrations/0058_governmentinterventionresult_activities_list.py b/EquiTrack/partners/migrations/0058_governmentinterventionresult_activities_list.py deleted file mode 100644 index 8087de62ae..0000000000 --- a/EquiTrack/partners/migrations/0058_governmentinterventionresult_activities_list.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0017_auto_20160428_1033'), - ('partners', '0057_auto_20160509_1827'), - ] - - operations = [ - migrations.AddField( - model_name='governmentinterventionresult', - name='activities_list', - field=models.ManyToManyField(related_name='activities_list', null=True, to='reports.Result', blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0059_auto_20160621_2228.py b/EquiTrack/partners/migrations/0059_auto_20160621_2228.py deleted file mode 100644 index 25bb197e46..0000000000 --- a/EquiTrack/partners/migrations/0059_auto_20160621_2228.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import datetime -from django.utils.timezone import utc - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0058_governmentinterventionresult_activities_list'), - ] - - operations = [ - migrations.AddField( - model_name='governmentintervention', - name='created_at', - field=models.DateTimeField(default=datetime.datetime(2016, 6, 21, 19, 28, 31, 356899, tzinfo=utc), auto_now_add=True), - preserve_default=False, - ), - migrations.AddField( - model_name='governmentintervention', - name='number', - field=models.CharField(max_length=45L, verbose_name=b'Reference Number', blank=True), - ), - migrations.AlterField( - model_name='agreement', - name='agreement_number', - field=models.CharField(max_length=45L, verbose_name='Reference Number', blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0060_auto_20160721_2313.py b/EquiTrack/partners/migrations/0060_auto_20160721_2313.py deleted file mode 100644 index f506525a20..0000000000 --- a/EquiTrack/partners/migrations/0060_auto_20160721_2313.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0059_auto_20160621_2228'), - ] - - operations = [ - migrations.AlterField( - model_name='pca', - name='number', - field=models.CharField(max_length=45L, null=True, verbose_name='Reference Number', blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0061_partnerorganization_hidden.py b/EquiTrack/partners/migrations/0061_partnerorganization_hidden.py deleted file mode 100644 index 678e0ea27c..0000000000 --- a/EquiTrack/partners/migrations/0061_partnerorganization_hidden.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0060_auto_20160721_2313'), - ] - - operations = [ - migrations.AddField( - model_name='partnerorganization', - name='hidden', - field=models.BooleanField(default=False), - ), - ] diff --git a/EquiTrack/partners/migrations/0062_auto_20160817_1742.py b/EquiTrack/partners/migrations/0062_auto_20160817_1742.py deleted file mode 100644 index 1fc762bce0..0000000000 --- a/EquiTrack/partners/migrations/0062_auto_20160817_1742.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0061_partnerorganization_hidden'), - ] - - operations = [ - migrations.AddField( - model_name='partnerorganization', - name='deleted_flag', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='partnerorganization', - name='total_ct_cp', - field=models.PositiveIntegerField(help_text=b'Total Cash Transferred for Country Programme', null=True, blank=True), - ), - migrations.AddField( - model_name='partnerorganization', - name='total_ct_cy', - field=models.PositiveIntegerField(help_text=b'Total Cash Transferred per Current Year', null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0063_auto_20160817_2202.py b/EquiTrack/partners/migrations/0063_auto_20160817_2202.py deleted file mode 100644 index f06f20f0f7..0000000000 --- a/EquiTrack/partners/migrations/0063_auto_20160817_2202.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0062_auto_20160817_1742'), - ] - - operations = [ - migrations.AlterField( - model_name='governmentinterventionresult', - name='activities_list', - field=models.ManyToManyField(related_name='activities_list', to='reports.Result', blank=True), - ), - migrations.AlterField( - model_name='partnerorganization', - name='vendor_number', - field=models.CharField(max_length=30, unique=True, null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0064_auto_20160817_2233.py b/EquiTrack/partners/migrations/0064_auto_20160817_2233.py deleted file mode 100644 index 9b97b82de9..0000000000 --- a/EquiTrack/partners/migrations/0064_auto_20160817_2233.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0063_auto_20160817_2202'), - ] - - operations = [ - migrations.AlterField( - model_name='fundingcommitment', - name='agreement_amount', - field=models.DecimalField(null=True, max_digits=12, decimal_places=2, blank=True), - ), - migrations.AlterField( - model_name='fundingcommitment', - name='commitment_amount', - field=models.DecimalField(null=True, max_digits=12, decimal_places=2, blank=True), - ), - migrations.AlterField( - model_name='fundingcommitment', - name='expenditure_amount', - field=models.DecimalField(null=True, max_digits=12, decimal_places=2, blank=True), - ), - migrations.AlterField( - model_name='fundingcommitment', - name='fr_item_amount_usd', - field=models.DecimalField(null=True, max_digits=12, decimal_places=2, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0065_auto_20160826_2024.py b/EquiTrack/partners/migrations/0065_auto_20160826_2024.py deleted file mode 100644 index b47833b751..0000000000 --- a/EquiTrack/partners/migrations/0065_auto_20160826_2024.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0064_auto_20160817_2233'), - ] - - operations = [ - migrations.RemoveField( - model_name='partnerorganization', - name='total_ct_cp', - ), - migrations.RemoveField( - model_name='partnerorganization', - name='total_ct_cy', - ), - ] diff --git a/EquiTrack/partners/migrations/0066_auto_20160826_2026.py b/EquiTrack/partners/migrations/0066_auto_20160826_2026.py deleted file mode 100644 index 2ab7b4cae4..0000000000 --- a/EquiTrack/partners/migrations/0066_auto_20160826_2026.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0065_auto_20160826_2024'), - ] - - operations = [ - migrations.AddField( - model_name='partnerorganization', - name='total_ct_cp', - field=models.DecimalField(help_text=b'Total Cash Transferred for Country Programme', null=True, max_digits=12, decimal_places=2, blank=True), - ), - migrations.AddField( - model_name='partnerorganization', - name='total_ct_cy', - field=models.DecimalField(help_text=b'Total Cash Transferred per Current Year', null=True, max_digits=12, decimal_places=2, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0067_auto_20160910_0836.py b/EquiTrack/partners/migrations/0067_auto_20160910_0836.py deleted file mode 100644 index 6add8c16bc..0000000000 --- a/EquiTrack/partners/migrations/0067_auto_20160910_0836.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0066_auto_20160826_2026'), - ] - - operations = [ - migrations.AlterField( - model_name='fundingcommitment', - name='fc_ref', - field=models.CharField(max_length=50, unique=True, null=True, blank=True), - ), - migrations.AlterField( - model_name='fundingcommitment', - name='grant', - field=models.ForeignKey(blank=True, to='funds.Grant', null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0068_remove_fundingcommitment_intervention.py b/EquiTrack/partners/migrations/0068_remove_fundingcommitment_intervention.py deleted file mode 100644 index bae55770f5..0000000000 --- a/EquiTrack/partners/migrations/0068_remove_fundingcommitment_intervention.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0067_auto_20160910_0836'), - ] - - operations = [ - migrations.RemoveField( - model_name='fundingcommitment', - name='intervention', - ), - ] diff --git a/EquiTrack/partners/migrations/0069_auto_20160915_2222.py b/EquiTrack/partners/migrations/0069_auto_20160915_2222.py deleted file mode 100644 index e2276d1434..0000000000 --- a/EquiTrack/partners/migrations/0069_auto_20160915_2222.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0068_remove_fundingcommitment_intervention'), - ] - - operations = [ - migrations.AlterField( - model_name='governmentintervention', - name='result_structure', - field=models.ForeignKey(to='reports.ResultStructure', on_delete=django.db.models.deletion.DO_NOTHING), - ), - migrations.AlterField( - model_name='pca', - name='result_structure', - field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, blank=True, to='reports.ResultStructure', help_text='Which result structure does this partnership report under?', null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0070_auto_20160915_2340.py b/EquiTrack/partners/migrations/0070_auto_20160915_2340.py deleted file mode 100644 index 84520627ef..0000000000 --- a/EquiTrack/partners/migrations/0070_auto_20160915_2340.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import smart_selects.db_fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0069_auto_20160915_2222'), - ] - - operations = [ - migrations.AlterField( - model_name='ramindicator', - name='indicator', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'result', chained_field=b'result', blank=True, auto_choose=True, to='reports.Indicator', null=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0071_auto_20160917_0142.py b/EquiTrack/partners/migrations/0071_auto_20160917_0142.py deleted file mode 100644 index 36cbb9f574..0000000000 --- a/EquiTrack/partners/migrations/0071_auto_20160917_0142.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0070_auto_20160915_2340'), - ] - - operations = [ - migrations.AlterField( - model_name='partnerorganization', - name='deleted_flag', - field=models.BooleanField(default=False, verbose_name='Marked for deletion'), - ), - ] diff --git a/EquiTrack/partners/migrations/0072_partnerorganization_hact_values.py b/EquiTrack/partners/migrations/0072_partnerorganization_hact_values.py deleted file mode 100644 index 2434e09f23..0000000000 --- a/EquiTrack/partners/migrations/0072_partnerorganization_hact_values.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0071_auto_20160917_0142'), - ] - - operations = [ - migrations.AddField( - model_name='partnerorganization', - name='hact_values', - field=jsonfield.fields.JSONField(default={}, null=True, blank=True), - ), - ] diff --git a/EquiTrack/partners/migrations/0073_governmentinterventionresult_planned_visits.py b/EquiTrack/partners/migrations/0073_governmentinterventionresult_planned_visits.py deleted file mode 100644 index aa06d34f74..0000000000 --- a/EquiTrack/partners/migrations/0073_governmentinterventionresult_planned_visits.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0072_partnerorganization_hact_values'), - ] - - operations = [ - migrations.AddField( - model_name='governmentinterventionresult', - name='planned_visits', - field=models.IntegerField(default=0), - ), - ] diff --git a/EquiTrack/partners/migrations/0074_auto_20161027_2022.py b/EquiTrack/partners/migrations/0074_auto_20161027_2022.py deleted file mode 100644 index 6a4f0289c6..0000000000 --- a/EquiTrack/partners/migrations/0074_auto_20161027_2022.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.10 on 2016-10-27 17:22 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0073_governmentinterventionresult_planned_visits'), - ] - - operations = [ - migrations.AlterField( - model_name='distributionplan', - name='document', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - migrations.AlterField( - model_name='indicatorreport', - name='disaggregation', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict), - ), - migrations.AlterField( - model_name='partnerorganization', - name='hact_values', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}, null=True), - ), - migrations.AlterField( - model_name='resultchain', - name='disaggregation', - field=django.contrib.postgres.fields.jsonb.JSONField(null=True), - ), - ] diff --git a/EquiTrack/reports/migrations/0001_initial.py b/EquiTrack/reports/migrations/0001_initial.py index f462d5d4bb..ef0a8d3c25 100644 --- a/EquiTrack/reports/migrations/0001_initial.py +++ b/EquiTrack/reports/migrations/0001_initial.py @@ -1,272 +1,209 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-09 22:22 from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models +import django.db.models.deletion +import mptt.fields import paintstore.fields class Migration(migrations.Migration): + initial = True + dependencies = [ - ('activityinfo', '0001_initial'), + ('activityinfo', '0002_auto_20151004_2246'), ] operations = [ migrations.CreateModel( - name='Activity', + name='CountryProgramme', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=128L)), - ('type', models.CharField(max_length=30L, null=True, blank=True)), - ('alternate_id', models.IntegerField(null=True, blank=True)), - ('alternate_name', models.CharField(max_length=255, null=True, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=150)), + ('wbs', models.CharField(max_length=30, unique=True)), + ('from_date', models.DateField()), + ('to_date', models.DateField()), ], - options={ - 'ordering': ['name'], - 'verbose_name_plural': 'Activities', - }, - bases=(models.Model,), ), migrations.CreateModel( name='Goal', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=512L)), - ('description', models.CharField(max_length=512L, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=512L, unique=True)), + ('description', models.CharField(blank=True, max_length=512L)), ], options={ 'ordering': ['name'], 'verbose_name': 'CCC', }, - bases=(models.Model,), ), migrations.CreateModel( name='Indicator', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=128L)), - ('code', models.CharField(max_length=10, null=True, blank=True)), - ('total', models.IntegerField(verbose_name=b'UNICEF Target')), - ('sector_total', models.IntegerField(null=True, verbose_name=b'Sector Target', blank=True)), - ('current', models.IntegerField(default=0, null=True, blank=True)), - ('sector_current', models.IntegerField(null=True, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=1024)), + ('code', models.CharField(blank=True, max_length=50, null=True)), + ('total', models.IntegerField(blank=True, null=True, verbose_name=b'UNICEF Target')), + ('sector_total', models.IntegerField(blank=True, null=True, verbose_name=b'Sector Target')), + ('current', models.IntegerField(blank=True, default=0, null=True)), + ('sector_current', models.IntegerField(blank=True, null=True)), + ('assumptions', models.TextField(blank=True, null=True)), + ('target', models.CharField(blank=True, max_length=255, null=True)), + ('baseline', models.CharField(blank=True, max_length=255, null=True)), + ('ram_indicator', models.BooleanField(default=False)), ('view_on_dashboard', models.BooleanField(default=False)), ('in_activity_info', models.BooleanField(default=False)), - ('activity_info_indicators', models.ManyToManyField(to='activityinfo.Indicator', null=True, blank=True)), + ('activity_info_indicators', models.ManyToManyField(blank=True, to='activityinfo.Indicator')), ], options={ 'ordering': ['name'], }, - bases=(models.Model,), ), migrations.CreateModel( - name='IntermediateResult', + name='Milestone', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('ir_wbs_reference', models.CharField(max_length=50L)), - ('name', models.CharField(unique=True, max_length=128L)), - ('from_date', models.DateField()), - ('to_date', models.DateField()), - ('alternate_id', models.IntegerField(null=True, blank=True)), - ('alternate_name', models.CharField(max_length=255, null=True, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('description', models.TextField()), + ('assumptions', models.TextField(blank=True, null=True)), ], - options={ - 'ordering': ['name'], - }, - bases=(models.Model,), ), migrations.CreateModel( name='Result', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=256L)), - ('code', models.CharField(max_length=10, null=True, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.TextField()), + ('code', models.CharField(blank=True, max_length=50, null=True)), + ('from_date', models.DateField(blank=True, null=True)), + ('to_date', models.DateField(blank=True, null=True)), + ('humanitarian_tag', models.BooleanField(default=False)), + ('wbs', models.CharField(blank=True, max_length=50, null=True)), + ('vision_id', models.CharField(blank=True, max_length=10, null=True)), + ('gic_code', models.CharField(blank=True, max_length=8, null=True)), + ('gic_name', models.CharField(blank=True, max_length=255, null=True)), + ('sic_code', models.CharField(blank=True, max_length=8, null=True)), + ('sic_name', models.CharField(blank=True, max_length=255, null=True)), + ('activity_focus_code', models.CharField(blank=True, max_length=8, null=True)), + ('activity_focus_name', models.CharField(blank=True, max_length=255, null=True)), + ('hidden', models.BooleanField(default=False)), + ('ram', models.BooleanField(default=False)), + ('lft', models.PositiveIntegerField(db_index=True, editable=False)), + ('rght', models.PositiveIntegerField(db_index=True, editable=False)), + ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), + ('level', models.PositiveIntegerField(db_index=True, editable=False)), + ('country_programme', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.CountryProgramme')), + ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='reports.Result')), ], options={ 'ordering': ['name'], }, - bases=(models.Model,), ), migrations.CreateModel( name='ResultStructure', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=150)), ('from_date', models.DateField()), ('to_date', models.DateField()), + ('country_programme', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.CountryProgramme')), ], options={ 'ordering': ['name'], }, - bases=(models.Model,), ), migrations.CreateModel( name='ResultType', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=150)), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='Rrp5Output', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=256L)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(choices=[(b'Outcome', b'Outcome'), (b'Output', b'Output'), (b'Activity', b'Activity'), (b'Sub-Activity', b'Sub-Activity')], max_length=150, unique=True)), ], - options={ - 'ordering': ['name'], - 'verbose_name': 'Output', - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='RRPObjective', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=256L)), - ('result_structure', models.ForeignKey(blank=True, to='reports.ResultStructure', null=True)), - ], - options={ - 'ordering': ['name'], - 'verbose_name': 'Objective', - }, - bases=(models.Model,), ), migrations.CreateModel( name='Sector', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=45L)), - ('description', models.CharField(max_length=256L, null=True, blank=True)), - ('alternate_id', models.IntegerField(null=True, blank=True)), - ('alternate_name', models.CharField(max_length=255, null=True, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=45L, unique=True)), + ('description', models.CharField(blank=True, max_length=256L, null=True)), + ('alternate_id', models.IntegerField(blank=True, null=True)), + ('alternate_name', models.CharField(blank=True, max_length=255, null=True)), ('dashboard', models.BooleanField(default=False)), - ('color', paintstore.fields.ColorPickerField(max_length=7, null=True, blank=True)), + ('color', paintstore.fields.ColorPickerField(blank=True, max_length=7, null=True)), ], options={ 'ordering': ['name'], }, - bases=(models.Model,), ), migrations.CreateModel( name='Unit', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('type', models.CharField(unique=True, max_length=45L)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('type', models.CharField(max_length=45L, unique=True)), ], options={ 'ordering': ['type'], }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='WBS', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=128L)), - ('code', models.CharField(max_length=128L)), - ('Intermediate_result', models.ForeignKey(to='reports.IntermediateResult')), - ], - options={ - 'ordering': ['name'], - }, - bases=(models.Model,), - ), - migrations.AddField( - model_name='rrpobjective', - name='sector', - field=models.ForeignKey(to='reports.Sector'), - preserve_default=True, - ), - migrations.AddField( - model_name='rrp5output', - name='objective', - field=models.ForeignKey(blank=True, to='reports.RRPObjective', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='rrp5output', - name='result_structure', - field=models.ForeignKey(blank=True, to='reports.ResultStructure', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='rrp5output', - name='sector', - field=models.ForeignKey(to='reports.Sector'), - preserve_default=True, - ), - migrations.AlterUniqueTogether( - name='rrp5output', - unique_together=set([('result_structure', 'name')]), ), migrations.AddField( model_name='result', name='result_structure', - field=models.ForeignKey(to='reports.ResultStructure'), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='reports.ResultStructure'), ), migrations.AddField( model_name='result', name='result_type', - field=models.ForeignKey(to='reports.ResultType'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.ResultType'), ), migrations.AddField( model_name='result', name='sector', - field=models.ForeignKey(to='reports.Sector'), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.Sector'), ), migrations.AddField( - model_name='intermediateresult', - name='sector', - field=models.ForeignKey(to='reports.Sector'), - preserve_default=True, + model_name='milestone', + name='result', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='milestones', to='reports.Result'), ), migrations.AddField( model_name='indicator', name='result', - field=models.ForeignKey(blank=True, to='reports.Result', null=True), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.Result'), ), migrations.AddField( model_name='indicator', name='result_structure', - field=models.ForeignKey(blank=True, to='reports.ResultStructure', null=True), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='reports.ResultStructure'), ), migrations.AddField( model_name='indicator', name='sector', - field=models.ForeignKey(to='reports.Sector'), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.Sector'), ), migrations.AddField( model_name='indicator', name='unit', - field=models.ForeignKey(to='reports.Unit'), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='reports.Unit'), ), migrations.AddField( model_name='goal', name='result_structure', - field=models.ForeignKey(blank=True, to='reports.ResultStructure', null=True), - preserve_default=True, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='reports.ResultStructure'), ), migrations.AddField( model_name='goal', name='sector', - field=models.ForeignKey(related_name='goals', to='reports.Sector'), - preserve_default=True, + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='goals', to='reports.Sector'), ), - migrations.AddField( - model_name='activity', - name='sector', - field=models.ForeignKey(to='reports.Sector'), - preserve_default=True, + migrations.AlterUniqueTogether( + name='resultstructure', + unique_together=set([('name', 'from_date', 'to_date')]), + ), + migrations.AlterUniqueTogether( + name='result', + unique_together=set([('wbs', 'country_programme')]), + ), + migrations.AlterUniqueTogether( + name='indicator', + unique_together=set([('name', 'result', 'sector')]), ), ] diff --git a/EquiTrack/reports/migrations/0002_auto_20151012_1321.py b/EquiTrack/reports/migrations/0002_auto_20151012_1321.py deleted file mode 100644 index 5e3edd8238..0000000000 --- a/EquiTrack/reports/migrations/0002_auto_20151012_1321.py +++ /dev/null @@ -1,146 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -import mptt.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0004_auto_20151012_1321'), - ('partners', '0003_auto_20151012_1321'), - ('reports', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='activity', - name='sector', - ), - migrations.DeleteModel( - name='Activity', - ), - migrations.RemoveField( - model_name='intermediateresult', - name='sector', - ), - migrations.AlterUniqueTogether( - name='rrp5output', - unique_together=None, - ), - migrations.RemoveField( - model_name='rrp5output', - name='objective', - ), - migrations.RemoveField( - model_name='rrp5output', - name='result_structure', - ), - migrations.RemoveField( - model_name='rrp5output', - name='sector', - ), - migrations.DeleteModel( - name='Rrp5Output', - ), - migrations.RemoveField( - model_name='rrpobjective', - name='result_structure', - ), - migrations.RemoveField( - model_name='rrpobjective', - name='sector', - ), - migrations.DeleteModel( - name='RRPObjective', - ), - migrations.RemoveField( - model_name='wbs', - name='Intermediate_result', - ), - migrations.DeleteModel( - name='IntermediateResult', - ), - migrations.DeleteModel( - name='WBS', - ), - migrations.AddField( - model_name='result', - name='gic_code', - field=models.CharField(max_length=8, null=True, blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='result', - name='gic_name', - field=models.CharField(max_length=255, null=True, blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='result', - name='humanitarian_tag', - field=models.BooleanField(default=False), - preserve_default=True, - ), - migrations.AddField( - model_name='result', - name='level', - field=models.PositiveIntegerField(default=1, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='result', - name='lft', - field=models.PositiveIntegerField(default=1, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='result', - name='parent', - field=mptt.fields.TreeForeignKey(related_name='children', blank=True, to='reports.Result', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='result', - name='rght', - field=models.PositiveIntegerField(default=1, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='result', - name='sic_code', - field=models.CharField(max_length=8, null=True, blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='result', - name='sic_name', - field=models.CharField(max_length=255, null=True, blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='result', - name='tree_id', - field=models.PositiveIntegerField(default=1, editable=False, db_index=True), - preserve_default=False, - ), - migrations.AddField( - model_name='result', - name='vision_id', - field=models.CharField(max_length=10, null=True, blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='result', - name='wbs', - field=models.CharField(max_length=20, null=True, blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='result', - name='name', - field=models.CharField(unique=True, max_length=256L), - preserve_default=True, - ), - ] diff --git a/EquiTrack/reports/migrations/0003_auto_20151014_0817.py b/EquiTrack/reports/migrations/0003_auto_20151014_0817.py deleted file mode 100644 index fc817999a5..0000000000 --- a/EquiTrack/reports/migrations/0003_auto_20151014_0817.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0002_auto_20151012_1321'), - ] - - operations = [ - migrations.AlterField( - model_name='result', - name='name', - field=models.TextField(unique=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/reports/migrations/0004_auto_20151015_1202.py b/EquiTrack/reports/migrations/0004_auto_20151015_1202.py deleted file mode 100644 index 8cb35240b7..0000000000 --- a/EquiTrack/reports/migrations/0004_auto_20151015_1202.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0003_auto_20151014_0817'), - ] - - operations = [ - migrations.AddField( - model_name='result', - name='activity_focus_code', - field=models.CharField(max_length=8, null=True, blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='result', - name='activity_focus_name', - field=models.CharField(max_length=255, null=True, blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='result', - name='sector', - field=models.ForeignKey(blank=True, to='reports.Sector', null=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/reports/migrations/0005_auto_20151015_1930.py b/EquiTrack/reports/migrations/0005_auto_20151015_1930.py deleted file mode 100644 index b48300ad92..0000000000 --- a/EquiTrack/reports/migrations/0005_auto_20151015_1930.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0004_auto_20151015_1202'), - ] - - operations = [ - migrations.AlterField( - model_name='result', - name='wbs', - field=models.CharField(max_length=50, null=True, blank=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/reports/migrations/0006_auto_20151015_1934.py b/EquiTrack/reports/migrations/0006_auto_20151015_1934.py deleted file mode 100644 index 23b1173010..0000000000 --- a/EquiTrack/reports/migrations/0006_auto_20151015_1934.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0005_auto_20151015_1930'), - ] - - operations = [ - migrations.AlterField( - model_name='result', - name='name', - field=models.TextField(), - preserve_default=True, - ), - ] diff --git a/EquiTrack/reports/migrations/0007_auto_20151124_1245.py b/EquiTrack/reports/migrations/0007_auto_20151124_1245.py deleted file mode 100644 index fb33d0e381..0000000000 --- a/EquiTrack/reports/migrations/0007_auto_20151124_1245.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0006_auto_20151015_1934'), - ] - - operations = [ - migrations.AlterField( - model_name='indicator', - name='total', - field=models.IntegerField(null=True, verbose_name=b'UNICEF Target', blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='indicator', - name='unit', - field=models.ForeignKey(blank=True, to='reports.Unit', null=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/reports/migrations/0008_auto_20151124_1417.py b/EquiTrack/reports/migrations/0008_auto_20151124_1417.py deleted file mode 100644 index b34893f988..0000000000 --- a/EquiTrack/reports/migrations/0008_auto_20151124_1417.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0007_auto_20151124_1245'), - ] - - operations = [ - migrations.AlterField( - model_name='indicator', - name='code', - field=models.CharField(max_length=50, null=True, blank=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/reports/migrations/0009_auto_20151126_1702.py b/EquiTrack/reports/migrations/0009_auto_20151126_1702.py deleted file mode 100644 index c1914aeb99..0000000000 --- a/EquiTrack/reports/migrations/0009_auto_20151126_1702.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0008_auto_20151124_1417'), - ] - - operations = [ - migrations.AlterField( - model_name='result', - name='code', - field=models.CharField(max_length=50, null=True, blank=True), - ), - ] diff --git a/EquiTrack/reports/migrations/0010_auto_20160202_1756.py b/EquiTrack/reports/migrations/0010_auto_20160202_1756.py deleted file mode 100644 index 27d579892b..0000000000 --- a/EquiTrack/reports/migrations/0010_auto_20160202_1756.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0009_auto_20151126_1702'), - ] - - operations = [ - migrations.AddField( - model_name='result', - name='hidden', - field=models.BooleanField(default=False), - ), - ] diff --git a/EquiTrack/reports/migrations/0011_auto_20160207_2248.py b/EquiTrack/reports/migrations/0011_auto_20160207_2248.py deleted file mode 100644 index adab7514aa..0000000000 --- a/EquiTrack/reports/migrations/0011_auto_20160207_2248.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0010_auto_20160202_1756'), - ] - - operations = [ - migrations.AddField( - model_name='result', - name='from_date', - field=models.DateField(null=True, blank=True), - ), - migrations.AddField( - model_name='result', - name='to_date', - field=models.DateField(null=True, blank=True), - ), - ] diff --git a/EquiTrack/reports/migrations/0012_auto_20160222_1652.py b/EquiTrack/reports/migrations/0012_auto_20160222_1652.py deleted file mode 100644 index 4e88148912..0000000000 --- a/EquiTrack/reports/migrations/0012_auto_20160222_1652.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-22 14:52 -from __future__ import unicode_literals - -from django.db import migrations -import django.db.models.manager - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0011_auto_20160207_2248'), - ] - - operations = [ - migrations.AlterModelManagers( - name='result', - managers=[ - ('_default_manager', django.db.models.manager.Manager()), - ], - ), - ] diff --git a/EquiTrack/reports/migrations/0013_auto_20160226_1543.py b/EquiTrack/reports/migrations/0013_auto_20160226_1543.py deleted file mode 100644 index c0db34874d..0000000000 --- a/EquiTrack/reports/migrations/0013_auto_20160226_1543.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0012_auto_20160222_1652'), - ] - - operations = [ - migrations.AlterModelManagers( - name='result', - managers=[ - ], - ), - ] diff --git a/EquiTrack/reports/migrations/0014_auto_20160314_0319.py b/EquiTrack/reports/migrations/0014_auto_20160314_0319.py deleted file mode 100644 index 9e36bcef36..0000000000 --- a/EquiTrack/reports/migrations/0014_auto_20160314_0319.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0013_auto_20160226_1543'), - ] - - operations = [ - migrations.AddField( - model_name='indicator', - name='baseline', - field=models.CharField(max_length=255, null=True, blank=True), - ), - migrations.AddField( - model_name='indicator', - name='ram_indicator', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='indicator', - name='target', - field=models.CharField(max_length=255, null=True, blank=True), - ), - migrations.AlterField( - model_name='indicator', - name='name', - field=models.CharField(unique=True, max_length=255), - ), - migrations.AlterField( - model_name='indicator', - name='sector', - field=models.ForeignKey(blank=True, to='reports.Sector', null=True), - ), - ] diff --git a/EquiTrack/reports/migrations/0015_result_ram.py b/EquiTrack/reports/migrations/0015_result_ram.py deleted file mode 100644 index 183db2ef21..0000000000 --- a/EquiTrack/reports/migrations/0015_result_ram.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0014_auto_20160314_0319'), - ] - - operations = [ - migrations.AddField( - model_name='result', - name='ram', - field=models.BooleanField(default=False), - ), - ] diff --git a/EquiTrack/reports/migrations/0016_auto_20160323_1933.py b/EquiTrack/reports/migrations/0016_auto_20160323_1933.py deleted file mode 100644 index 240d5e09e2..0000000000 --- a/EquiTrack/reports/migrations/0016_auto_20160323_1933.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0015_result_ram'), - ] - - operations = [ - migrations.AlterField( - model_name='indicator', - name='name', - field=models.CharField(max_length=255), - ), - migrations.AlterUniqueTogether( - name='indicator', - unique_together=set([('name', 'result', 'sector')]), - ), - ] diff --git a/EquiTrack/reports/migrations/0017_auto_20160428_1033.py b/EquiTrack/reports/migrations/0017_auto_20160428_1033.py deleted file mode 100644 index db21d45a48..0000000000 --- a/EquiTrack/reports/migrations/0017_auto_20160428_1033.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0016_auto_20160323_1933'), - ] - - operations = [ - migrations.AlterField( - model_name='indicator', - name='activity_info_indicators', - field=models.ManyToManyField(to='activityinfo.Indicator'), - ), - ] diff --git a/EquiTrack/reports/migrations/0018_auto_20160811_1654.py b/EquiTrack/reports/migrations/0018_auto_20160811_1654.py deleted file mode 100644 index e22e44e214..0000000000 --- a/EquiTrack/reports/migrations/0018_auto_20160811_1654.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0017_auto_20160428_1033'), - ] - - operations = [ - migrations.AlterField( - model_name='indicator', - name='name', - field=models.CharField(max_length=1024), - ), - ] diff --git a/EquiTrack/reports/migrations/0019_auto_20160825_1857.py b/EquiTrack/reports/migrations/0019_auto_20160825_1857.py deleted file mode 100644 index 58712cff00..0000000000 --- a/EquiTrack/reports/migrations/0019_auto_20160825_1857.py +++ /dev/null @@ -1,66 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django.contrib.postgres.fields -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0014_auto_20160816_2228'), - ('locations', '0006_auto_20160229_1545'), - ('reports', '0018_auto_20160811_1654'), - ] - - operations = [ - migrations.CreateModel( - name='Milestone', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('description', models.TextField()), - ('assumptions', models.TextField(null=True, blank=True)), - ], - ), - migrations.AddField( - model_name='result', - name='assumptions', - field=models.TextField(null=True, blank=True), - ), - migrations.AddField( - model_name='result', - name='geotag', - field=models.ManyToManyField(to='locations.Location'), - ), - migrations.AddField( - model_name='result', - name='metadata', - field=jsonfield.fields.JSONField(null=True, blank=True), - ), - migrations.AddField( - model_name='result', - name='prioritized', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='result', - name='sections', - field=models.ManyToManyField(to='users.Section'), - ), - migrations.AddField( - model_name='result', - name='status', - field=models.CharField(blank=True, max_length=255, null=True, choices=[(b'On Track', b'On Track'), (b'Constrained', b'Constrained'), (b'No Progress', b'No Progress'), (b'Target Met', b'Target Met')]), - ), - migrations.AddField( - model_name='result', - name='users', - field=django.contrib.postgres.fields.ArrayField(default=list, base_field=models.IntegerField(), size=None), - ), - migrations.AddField( - model_name='milestone', - name='result', - field=models.ForeignKey(related_name='milestones', to='reports.Result'), - ), - ] diff --git a/EquiTrack/reports/migrations/0020_indicator_assumptions.py b/EquiTrack/reports/migrations/0020_indicator_assumptions.py deleted file mode 100644 index 54d5f69a65..0000000000 --- a/EquiTrack/reports/migrations/0020_indicator_assumptions.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0019_auto_20160825_1857'), - ] - - operations = [ - migrations.AddField( - model_name='indicator', - name='assumptions', - field=models.TextField(null=True, blank=True), - ), - ] diff --git a/EquiTrack/reports/migrations/0021_auto_20160906_1925.py b/EquiTrack/reports/migrations/0021_auto_20160906_1925.py deleted file mode 100644 index dfb82f76bc..0000000000 --- a/EquiTrack/reports/migrations/0021_auto_20160906_1925.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0020_indicator_assumptions'), - ] - - operations = [ - migrations.CreateModel( - name='CountryProgramme', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=150)), - ('wbs', models.CharField(unique=True, max_length=30)), - ('from_date', models.DateField()), - ('to_date', models.DateField()), - ], - ), - migrations.AlterField( - model_name='result', - name='result_structure', - field=models.ForeignKey(blank=True, to='reports.ResultStructure', null=True), - ), - migrations.AlterField( - model_name='resulttype', - name='name', - field=models.CharField(unique=True, max_length=150, choices=[(b'Outcome', b'Outcome'), (b'Output', b'Output'), (b'Activity', b'Activity'), (b'Sub-Activity', b'Sub-Activity')]), - ), - migrations.AlterUniqueTogether( - name='indicator', - unique_together=set([]), - ), - migrations.AddField( - model_name='result', - name='country_programme', - field=models.ForeignKey(blank=True, to='reports.CountryProgramme', null=True), - ), - migrations.AddField( - model_name='resultstructure', - name='country_programme', - field=models.ForeignKey(blank=True, to='reports.CountryProgramme', null=True), - ), - ] diff --git a/EquiTrack/reports/migrations/0022_auto_20160906_1927.py b/EquiTrack/reports/migrations/0022_auto_20160906_1927.py deleted file mode 100644 index c98f773a54..0000000000 --- a/EquiTrack/reports/migrations/0022_auto_20160906_1927.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0021_auto_20160906_1925'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='indicator', - unique_together=set([('name', 'result', 'sector')]), - ), - migrations.AlterUniqueTogether( - name='result', - unique_together=set([('wbs', 'country_programme')]), - ), - migrations.AlterUniqueTogether( - name='resultstructure', - unique_together=set([('name', 'from_date', 'to_date')]), - ), - ] diff --git a/EquiTrack/reports/migrations/0023_auto_20160909_2203.py b/EquiTrack/reports/migrations/0023_auto_20160909_2203.py deleted file mode 100644 index 9e61c86ffa..0000000000 --- a/EquiTrack/reports/migrations/0023_auto_20160909_2203.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0022_auto_20160906_1927'), - ] - - operations = [ - migrations.AlterField( - model_name='indicator', - name='activity_info_indicators', - field=models.ManyToManyField(to='activityinfo.Indicator', blank=True), - ), - ] diff --git a/EquiTrack/reports/migrations/0024_auto_20160915_2222.py b/EquiTrack/reports/migrations/0024_auto_20160915_2222.py deleted file mode 100644 index de9c579d4b..0000000000 --- a/EquiTrack/reports/migrations/0024_auto_20160915_2222.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0023_auto_20160909_2203'), - ] - - operations = [ - migrations.AlterField( - model_name='goal', - name='result_structure', - field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, blank=True, to='reports.ResultStructure', null=True), - ), - migrations.AlterField( - model_name='indicator', - name='result_structure', - field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, blank=True, to='reports.ResultStructure', null=True), - ), - migrations.AlterField( - model_name='result', - name='result_structure', - field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, blank=True, to='reports.ResultStructure', null=True), - ), - ] diff --git a/EquiTrack/reports/migrations/0024_auto_20161005_2137.py b/EquiTrack/reports/migrations/0024_auto_20161005_2137.py deleted file mode 100644 index af3cb35ea3..0000000000 --- a/EquiTrack/reports/migrations/0024_auto_20161005_2137.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0023_auto_20160909_2203'), - ] - - operations = [ - - ] diff --git a/EquiTrack/reports/migrations/0025_merge.py b/EquiTrack/reports/migrations/0025_merge.py deleted file mode 100644 index 37b2f8f232..0000000000 --- a/EquiTrack/reports/migrations/0025_merge.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0024_auto_20160915_2222'), - ('reports', '0024_auto_20161005_2137'), - ] - - operations = [ - ] diff --git a/EquiTrack/reports/migrations/0026_auto_20161013_2034.py b/EquiTrack/reports/migrations/0026_auto_20161013_2034.py deleted file mode 100644 index 2d2581904d..0000000000 --- a/EquiTrack/reports/migrations/0026_auto_20161013_2034.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reports', '0025_merge'), - ] - - operations = [ - migrations.RemoveField( - model_name='result', - name='assumptions', - ), - migrations.RemoveField( - model_name='result', - name='geotag', - ), - migrations.RemoveField( - model_name='result', - name='metadata', - ), - migrations.RemoveField( - model_name='result', - name='prioritized', - ), - migrations.RemoveField( - model_name='result', - name='sections', - ), - migrations.RemoveField( - model_name='result', - name='status', - ), - migrations.RemoveField( - model_name='result', - name='users', - ), - ] diff --git a/EquiTrack/tpm/migrations/0001_initial.py b/EquiTrack/tpm/migrations/0001_initial.py index 6586384744..754d9cb6ac 100644 --- a/EquiTrack/tpm/migrations/0001_initial.py +++ b/EquiTrack/tpm/migrations/0001_initial.py @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('partners', '0001_initial'), + # ('partners', '0001_initial'), ] operations = [ diff --git a/EquiTrack/trips/migrations/0001_initial.py b/EquiTrack/trips/migrations/0001_initial.py index a5e2daae98..21e216c242 100644 --- a/EquiTrack/trips/migrations/0001_initial.py +++ b/EquiTrack/trips/migrations/0001_initial.py @@ -1,104 +1,141 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-09 22:22 from __future__ import unicode_literals -from django.db import models, migrations -import smart_selects.db_fields -import trips.models import EquiTrack.mixins from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import smart_selects.db_fields +import trips.models class Migration(migrations.Migration): + initial = True + dependencies = [ - ('reports', '0001_initial'), - ('locations', '0001_initial'), + ('contenttypes', '0002_remove_content_type_name'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('funds', '0001_initial'), + ('users', '__first__'), + ('reports', '0001_initial'), + ('locations', '0001_initial'), + ('partners', '0001_initial'), ] operations = [ migrations.CreateModel( name='ActionPoint', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('description', models.CharField(max_length=254)), ('due_date', models.DateField()), - ('actions_taken', models.TextField(null=True, blank=True)), - ('completed_date', models.DateField(null=True, blank=True)), - ('comments', models.TextField(null=True, blank=True)), - ('status', models.CharField(max_length=254, null=True, verbose_name=b'Status', choices=[(b'closed', b'Closed'), (b'ongoing', b'On-going'), (b'open', b'Open'), (b'cancelled', b'Cancelled')])), + ('actions_taken', models.TextField(blank=True, null=True)), + ('completed_date', models.DateField(blank=True, null=True)), + ('comments', models.TextField(blank=True, null=True)), + ('status', models.CharField(choices=[(b'closed', b'Closed'), (b'ongoing', b'On-going'), (b'open', b'Open'), (b'cancelled', b'Cancelled')], max_length=254, null=True, verbose_name=b'Status')), ('created_date', models.DateTimeField(auto_now_add=True)), + ('follow_up', models.BooleanField(default=False)), + ('person_responsible', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='for_action', to=settings.AUTH_USER_MODEL)), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='FileAttachment', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('report', models.FileField(upload_to=trips.models.get_report_filename)), - ('object_id', models.PositiveIntegerField(null=True, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('caption', models.TextField(blank=True, help_text=b'Description of the file to upload: optional', null=True, verbose_name=b'Caption / Description')), + ('report', models.FileField(max_length=255, upload_to=trips.models.get_report_filename)), + ('object_id', models.PositiveIntegerField(blank=True, null=True)), + ('content_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ], + ), + migrations.CreateModel( + name='LinkedGovernmentPartner', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('intervention', smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field=b'partner', chained_model_field=b'partner', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='trips', to='partners.GovernmentIntervention')), + ('partner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.PartnerOrganization')), + ('result', smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field=b'intervention', chained_model_field=b'intervention', null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.GovernmentInterventionResult')), + ], + ), + migrations.CreateModel( + name='LinkedPartner', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('intervention', smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field=b'partner', chained_model_field=b'partner', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='trips', to='partners.PCA')), + ('partner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.PartnerOrganization')), + ('result', smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field=b'intervention', chained_model_field=b'partnership', null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.ResultChain')), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='TravelRoutes', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('origin', models.CharField(max_length=254)), ('destination', models.CharField(max_length=254)), ('depart', models.DateTimeField()), ('arrive', models.DateTimeField()), - ('remarks', models.CharField(max_length=254, null=True, blank=True)), + ('remarks', models.CharField(blank=True, max_length=254, null=True)), ], options={ 'verbose_name': 'Travel Itinerary', 'verbose_name_plural': 'Travel Itinerary', }, - bases=(models.Model,), ), migrations.CreateModel( name='Trip', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('status', models.CharField(default='planned', max_length=32L, choices=[('planned', 'Planned'), ('submitted', 'Submitted'), ('approved', 'Approved'), ('completed', 'Completed'), ('cancelled', 'Cancelled')])), - ('cancelled_reason', models.CharField(help_text=b'Please provide a reason if the mission is cancelled', max_length=254, null=True, blank=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('status', models.CharField(choices=[('planned', 'Planned'), ('submitted', 'Submitted'), ('approved', 'Approved'), ('completed', 'Completed'), ('cancelled', 'Cancelled')], default='planned', max_length=32L)), + ('cancelled_reason', models.CharField(blank=True, help_text=b'Please provide a reason if the mission is cancelled', max_length=254, null=True)), ('purpose_of_travel', models.CharField(max_length=254)), - ('travel_type', models.CharField(default='programme_monitoring', max_length=32L, choices=[('programme_monitoring', 'PROGRAMMATIC VISIT'), ('spot_check', 'SPOT CHECK'), ('advocacy', 'ADVOCACY'), ('technical_support', 'TECHNICAL SUPPORT'), ('meeting', 'MEETING'), ('staff_development', 'STAFF DEVELOPMENT'), ('staff_entitlement', 'STAFF ENTITLEMENT')])), + ('travel_type', models.CharField(choices=[('programme_monitoring', 'PROGRAMMATIC VISIT'), ('spot_check', 'SPOT CHECK'), ('advocacy', 'ADVOCACY'), ('technical_support', 'TECHNICAL SUPPORT'), ('meeting', 'MEETING'), ('staff_development', 'STAFF DEVELOPMENT'), ('staff_entitlement', 'STAFF ENTITLEMENT')], default='programme_monitoring', max_length=32L)), ('security_clearance_required', models.BooleanField(default=False, help_text=b'Do you need security clarance for this trip?')), ('international_travel', models.BooleanField(default=False, help_text=b'International travel will require approval from the representative')), ('from_date', models.DateField()), ('to_date', models.DateField()), - ('main_observations', models.TextField(null=True, blank=True)), - ('constraints', models.TextField(null=True, blank=True)), - ('lessons_learned', models.TextField(null=True, blank=True)), - ('opportunities', models.TextField(null=True, blank=True)), - ('ta_required', models.BooleanField(default=False, help_text=b'Is a Travel Authorisation (TA) is required?')), - ('ta_drafted', models.BooleanField(default=False, help_text=b'Has the TA been drafted in vision if applicable?')), - ('ta_drafted_date', models.DateField(null=True, blank=True)), - ('ta_reference', models.CharField(max_length=254, null=True, blank=True)), + ('main_observations', models.TextField(blank=True, null=True)), + ('constraints', models.TextField(blank=True, null=True)), + ('lessons_learned', models.TextField(blank=True, null=True)), + ('opportunities', models.TextField(blank=True, null=True)), + ('ta_required', models.BooleanField(default=False, help_text=b'Is a Travel Authorisation (TA) is required?', verbose_name=b'TA required?')), + ('ta_drafted', models.BooleanField(default=False, help_text=b'Has the TA been drafted in vision if applicable?', verbose_name=b'TA drafted?')), + ('ta_drafted_date', models.DateField(blank=True, null=True, verbose_name=b'TA drafted date')), + ('ta_reference', models.CharField(blank=True, max_length=254, null=True, verbose_name=b'TA reference')), ('transport_booked', models.BooleanField(default=False)), ('security_granted', models.BooleanField(default=False)), ('approved_by_supervisor', models.BooleanField(default=False)), - ('date_supervisor_approved', models.DateField(null=True, blank=True)), + ('date_supervisor_approved', models.DateField(blank=True, null=True)), ('approved_by_budget_owner', models.BooleanField(default=False)), - ('date_budget_owner_approved', models.DateField(null=True, blank=True)), - ('approved_by_human_resources', models.NullBooleanField(default=None, choices=[(None, b'N/A'), (True, b'Yes'), (False, b'No')], help_text=b'HR must approve all trips relating to training and staff development', verbose_name=b'Certified by human resources')), - ('date_human_resources_approved', models.DateField(null=True, blank=True)), - ('representative_approval', models.NullBooleanField(default=None, choices=[(None, b'N/A'), (True, b'Yes'), (False, b'No')])), - ('date_representative_approved', models.DateField(null=True, blank=True)), - ('approved_date', models.DateField(null=True, blank=True)), + ('date_budget_owner_approved', models.DateField(blank=True, null=True)), + ('approved_by_human_resources', models.NullBooleanField(choices=[(None, b'N/A'), (True, b'Yes'), (False, b'No')], default=None, help_text=b'HR must approve all trips relating to training and staff development', verbose_name=b'Certified by human resources')), + ('date_human_resources_approved', models.DateField(blank=True, null=True)), + ('representative_approval', models.NullBooleanField(choices=[(None, b'N/A'), (True, b'Yes'), (False, b'No')], default=None)), + ('date_representative_approved', models.DateField(blank=True, null=True)), + ('approved_date', models.DateField(blank=True, null=True)), ('created_date', models.DateTimeField(auto_now_add=True)), ('approved_email_sent', models.BooleanField(default=False)), - ('ta_trip_took_place_as_planned', models.BooleanField(default=False, help_text=b'I certify that the travel took place exactly as per the attached Travel Authorization and that there were no changes to the itinerary', verbose_name=b'Ta trip took place as attached')), + ('submitted_email_sent', models.BooleanField(default=False)), + ('ta_trip_took_place_as_planned', models.BooleanField(default=False, help_text=b'I certify that the travel took place exactly as per the attached Travel Authorization and that there were no changes to the itinerary', verbose_name=b'TA trip took place as attached')), ('ta_trip_repay_travel_allowance', models.BooleanField(default=False, help_text=b'I certify that I will repay any travel allowance to which I am not entitled')), ('ta_trip_final_claim', models.BooleanField(default=False, help_text=b'I authorize UNICEF to treat this as the FINAL Claim')), - ('budget_owner', models.ForeignKey(related_name='budgeted_trips', blank=True, to=settings.AUTH_USER_MODEL, null=True)), - ('human_resources', models.ForeignKey(related_name='certified_trips', blank=True, to=settings.AUTH_USER_MODEL, null=True)), + ('pending_ta_amendment', models.BooleanField(default=False)), + ('budget_owner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='budgeted_trips', to=settings.AUTH_USER_MODEL)), + ('driver', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='trips_driver', to=settings.AUTH_USER_MODEL, verbose_name=b'Driver')), + ('driver_supervisor', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='driver_supervised_trips', to=settings.AUTH_USER_MODEL, verbose_name=b'Supervisor for Driver')), + ('driver_trip', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='drivers_trip', to='trips.Trip')), + ('human_resources', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='certified_trips', to=settings.AUTH_USER_MODEL)), + ('office', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='users.Office')), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trips', to=settings.AUTH_USER_MODEL, verbose_name=b'Traveller')), + ('partners', models.ManyToManyField(blank=True, to='partners.PartnerOrganization')), + ('pcas', models.ManyToManyField(blank=True, to='partners.PCA', verbose_name='Related Interventions')), + ('programme_assistant', models.ForeignKey(blank=True, help_text=b'Needed if a Travel Authorisation (TA) is required', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='managed_trips', to=settings.AUTH_USER_MODEL, verbose_name=b'Staff Responsible for TA')), + ('representative', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='approved_trips', to=settings.AUTH_USER_MODEL)), + ('section', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='users.Section')), + ('supervisor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='supervised_trips', to=settings.AUTH_USER_MODEL)), + ('travel_assistant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='organised_trips', to=settings.AUTH_USER_MODEL, verbose_name=b'Travel focal point')), + ('vision_approver', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name=b'VISION Approver')), ], options={ 'ordering': ['-created_date'], @@ -108,30 +145,59 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TripFunds', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('amount', models.PositiveIntegerField(verbose_name=b'Percentage (%)')), - ('grant', models.ForeignKey(to='funds.Grant')), - ('trip', models.ForeignKey(to='trips.Trip')), - ('wbs', models.ForeignKey(to='reports.WBS')), + ('grant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.Grant')), + ('trip', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='trips.Trip')), + ('wbs', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.Result', verbose_name=b'WBS')), ], options={ 'verbose_name': 'Funding', 'verbose_name_plural': 'Funding', }, - bases=(models.Model,), ), migrations.CreateModel( name='TripLocation', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('governorate', models.ForeignKey(to='locations.Governorate')), - ('locality', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'region', chained_field=b'region', blank=True, auto_choose=True, to='locations.Locality', null=True)), - ('location', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'locality', chained_field=b'locality', blank=True, to='locations.Location', null=True)), - ('region', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'governorate', chained_field=b'governorate', auto_choose=True, to='locations.Region')), - ('trip', models.ForeignKey(to='trips.Trip')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('governorate', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Governorate')), + ('locality', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Locality')), + ('location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location')), + ('region', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Region')), + ('trip', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='trips.Trip')), ], options={ + 'ordering': ['id'], }, - bases=(models.Model,), + ), + migrations.AddField( + model_name='travelroutes', + name='trip', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='trips.Trip'), + ), + migrations.AddField( + model_name='linkedpartner', + name='trip', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='trips.Trip'), + ), + migrations.AddField( + model_name='linkedgovernmentpartner', + name='trip', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='trips.Trip'), + ), + migrations.AddField( + model_name='fileattachment', + name='trip', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='files', to='trips.Trip'), + ), + migrations.AddField( + model_name='fileattachment', + name='type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.FileType'), + ), + migrations.AddField( + model_name='actionpoint', + name='trip', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='trips.Trip'), ), ] diff --git a/EquiTrack/trips/migrations/0002_auto_20151004_2225.py b/EquiTrack/trips/migrations/0002_auto_20151004_2225.py deleted file mode 100644 index 9679f32fb8..0000000000 --- a/EquiTrack/trips/migrations/0002_auto_20151004_2225.py +++ /dev/null @@ -1,123 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -import filer.fields.file -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ('filer', '0002_auto_20150606_2003'), - ('trips', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('contenttypes', '0001_initial'), - ('partners', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='trip', - name='office', - field=models.ForeignKey(blank=True, to='users.Office', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='owner', - field=models.ForeignKey(related_name='trips', verbose_name=b'Traveller', to=settings.AUTH_USER_MODEL), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='partners', - field=models.ManyToManyField(to='partners.PartnerOrganization', null=True, blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='pcas', - field=models.ManyToManyField(to='partners.PCA', null=True, verbose_name='Related Partnerships', blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='programme_assistant', - field=models.ForeignKey(related_name='managed_trips', blank=True, to=settings.AUTH_USER_MODEL, help_text=b'Needed if a Travel Authorisation (TA) is required', null=True, verbose_name=b'Staff Responsible for TA'), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='representative', - field=models.ForeignKey(related_name='approved_trips', blank=True, to=settings.AUTH_USER_MODEL, null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='section', - field=models.ForeignKey(blank=True, to='users.Section', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='supervisor', - field=models.ForeignKey(related_name='supervised_trips', to=settings.AUTH_USER_MODEL), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='travel_assistant', - field=models.ForeignKey(related_name='organised_trips', verbose_name=b'Travel focal point', blank=True, to=settings.AUTH_USER_MODEL, null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='vision_approver', - field=models.ForeignKey(verbose_name=b'VISION Approver', blank=True, to=settings.AUTH_USER_MODEL, null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='travelroutes', - name='trip', - field=models.ForeignKey(to='trips.Trip'), - preserve_default=True, - ), - migrations.AddField( - model_name='fileattachment', - name='content_type', - field=models.ForeignKey(blank=True, to='contenttypes.ContentType', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='fileattachment', - name='file', - field=filer.fields.file.FilerFileField(blank=True, to='filer.File', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='fileattachment', - name='trip', - field=models.ForeignKey(related_name='files', blank=True, to='trips.Trip', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='fileattachment', - name='type', - field=models.ForeignKey(to='partners.FileType'), - preserve_default=True, - ), - migrations.AddField( - model_name='actionpoint', - name='person_responsible', - field=models.ForeignKey(related_name='for_action', to=settings.AUTH_USER_MODEL), - preserve_default=True, - ), - migrations.AddField( - model_name='actionpoint', - name='trip', - field=models.ForeignKey(to='trips.Trip'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/trips/migrations/0003_auto_20151009_2046.py b/EquiTrack/trips/migrations/0003_auto_20151009_2046.py deleted file mode 100644 index 83a437a1fd..0000000000 --- a/EquiTrack/trips/migrations/0003_auto_20151009_2046.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0002_auto_20151004_2225'), - ] - - operations = [ - migrations.AlterField( - model_name='trip', - name='pcas', - field=models.ManyToManyField(to='partners.PCA', null=True, verbose_name='Related Interventions', blank=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/trips/migrations/0004_auto_20151012_1321.py b/EquiTrack/trips/migrations/0004_auto_20151012_1321.py deleted file mode 100644 index 3e997051c0..0000000000 --- a/EquiTrack/trips/migrations/0004_auto_20151012_1321.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0003_auto_20151009_2046'), - ] - - operations = [ - migrations.AlterField( - model_name='tripfunds', - name='wbs', - field=models.ForeignKey(to='reports.Result'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/trips/migrations/0005_auto_20151014_1955.py b/EquiTrack/trips/migrations/0005_auto_20151014_1955.py deleted file mode 100644 index a07abdb982..0000000000 --- a/EquiTrack/trips/migrations/0005_auto_20151014_1955.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0004_auto_20151012_1321'), - ] - - operations = [ - migrations.AlterField( - model_name='trip', - name='ta_drafted', - field=models.BooleanField(default=False, help_text=b'Has the TA been drafted in vision if applicable?', verbose_name=b'TA'), - preserve_default=True, - ), - migrations.AlterField( - model_name='tripfunds', - name='wbs', - field=models.ForeignKey(verbose_name=b'WBS', to='reports.Result'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/trips/migrations/0006_fileattachment_caption.py b/EquiTrack/trips/migrations/0006_fileattachment_caption.py deleted file mode 100644 index 3aaf777b53..0000000000 --- a/EquiTrack/trips/migrations/0006_fileattachment_caption.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0005_auto_20151014_1955'), - ] - - operations = [ - migrations.AddField( - model_name='fileattachment', - name='caption', - field=models.TextField(null=True, blank=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/trips/migrations/0007_auto_20151027_1852.py b/EquiTrack/trips/migrations/0007_auto_20151027_1852.py deleted file mode 100644 index 66379cae1a..0000000000 --- a/EquiTrack/trips/migrations/0007_auto_20151027_1852.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0006_fileattachment_caption'), - ] - - operations = [ - migrations.AlterField( - model_name='fileattachment', - name='caption', - field=models.TextField(help_text=b'Description of the file to upload: optional', null=True, verbose_name=b'Caption / Description', blank=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/trips/migrations/0008_auto_20151102_2052.py b/EquiTrack/trips/migrations/0008_auto_20151102_2052.py deleted file mode 100644 index f85fe78ed4..0000000000 --- a/EquiTrack/trips/migrations/0008_auto_20151102_2052.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('trips', '0007_auto_20151027_1852'), - ] - - operations = [ - migrations.AddField( - model_name='trip', - name='driver', - field=models.ForeignKey(related_name='trips_driver', verbose_name=b'Driver', blank=True, to=settings.AUTH_USER_MODEL, null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='driver_supervisor', - field=models.ForeignKey(related_name='driver_supervised_trips', verbose_name=b'Supervisor for Driver', blank=True, to=settings.AUTH_USER_MODEL, null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='driver_trip', - field=models.ForeignKey(related_name='drivers_trip', blank=True, to='trips.Trip', null=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/trips/migrations/0009_auto_20151118_1151.py b/EquiTrack/trips/migrations/0009_auto_20151118_1151.py deleted file mode 100644 index 1918bb1a32..0000000000 --- a/EquiTrack/trips/migrations/0009_auto_20151118_1151.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0008_auto_20151102_2052'), - ] - - operations = [ - migrations.AddField( - model_name='trip', - name='pending_ta_amendment', - field=models.BooleanField(default=False), - preserve_default=True, - ), - migrations.AddField( - model_name='trip', - name='submitted_email_sent', - field=models.BooleanField(default=False), - preserve_default=True, - ), - migrations.AlterField( - model_name='trip', - name='ta_drafted', - field=models.BooleanField(default=False, help_text=b'Has the TA been drafted in vision if applicable?', verbose_name=b'TA drafted?'), - preserve_default=True, - ), - migrations.AlterField( - model_name='trip', - name='ta_drafted_date', - field=models.DateField(null=True, verbose_name=b'TA drafted date', blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='trip', - name='ta_reference', - field=models.CharField(max_length=254, null=True, verbose_name=b'TA reference', blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='trip', - name='ta_required', - field=models.BooleanField(default=False, help_text=b'Is a Travel Authorisation (TA) is required?', verbose_name=b'TA required?'), - preserve_default=True, - ), - migrations.AlterField( - model_name='trip', - name='ta_trip_took_place_as_planned', - field=models.BooleanField(default=False, help_text=b'I certify that the travel took place exactly as per the attached Travel Authorization and that there were no changes to the itinerary', verbose_name=b'TA trip took place as attached'), - preserve_default=True, - ), - ] diff --git a/EquiTrack/trips/migrations/0010_auto_20160113_2233.py b/EquiTrack/trips/migrations/0010_auto_20160113_2233.py deleted file mode 100644 index 1dc2a263c9..0000000000 --- a/EquiTrack/trips/migrations/0010_auto_20160113_2233.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0009_auto_20151118_1151'), - ] - - operations = [ - migrations.AlterField( - model_name='triplocation', - name='governorate', - field=models.ForeignKey(blank=True, to='locations.Governorate', null=True), - ), - migrations.AlterField( - model_name='triplocation', - name='locality', - field=models.ForeignKey(blank=True, to='locations.Locality', null=True), - ), - migrations.AlterField( - model_name='triplocation', - name='location', - field=models.ForeignKey(blank=True, to='locations.Location', null=True), - ), - migrations.AlterField( - model_name='triplocation', - name='region', - field=models.ForeignKey(blank=True, to='locations.Region', null=True), - ), - ] diff --git a/EquiTrack/trips/migrations/0011_linkedpartner.py b/EquiTrack/trips/migrations/0011_linkedpartner.py deleted file mode 100644 index 3bd645177d..0000000000 --- a/EquiTrack/trips/migrations/0011_linkedpartner.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import smart_selects.db_fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0035_auto_20160314_1524'), - ('trips', '0010_auto_20160113_2233'), - ] - - operations = [ - migrations.CreateModel( - name='LinkedPartner', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('intervention', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'partner', related_name='trips', chained_field=b'partner', blank=True, auto_choose=True, to='partners.PCA', null=True)), - ('partner', models.ForeignKey(to='partners.PartnerOrganization')), - ('result', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'intervention', chained_field=b'intervention', blank=True, auto_choose=True, to='partners.ResultChain', null=True)), - ('trip', models.ForeignKey(to='trips.Trip')), - ], - ), - ] diff --git a/EquiTrack/trips/migrations/0012_auto_20160425_1243.py b/EquiTrack/trips/migrations/0012_auto_20160425_1243.py deleted file mode 100644 index 5d79af0ccd..0000000000 --- a/EquiTrack/trips/migrations/0012_auto_20160425_1243.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import trips.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0011_linkedpartner'), - ] - - operations = [ - migrations.RemoveField( - model_name='fileattachment', - name='file', - ), - migrations.AlterField( - model_name='fileattachment', - name='report', - field=models.FileField(max_length=255, upload_to=trips.models.get_report_filename), - ), - ] diff --git a/EquiTrack/trips/migrations/0013_auto_20160428_1249.py b/EquiTrack/trips/migrations/0013_auto_20160428_1249.py deleted file mode 100644 index 3652b6f8ac..0000000000 --- a/EquiTrack/trips/migrations/0013_auto_20160428_1249.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0012_auto_20160425_1243'), - ] - - operations = [ - migrations.AlterField( - model_name='trip', - name='partners', - field=models.ManyToManyField(to='partners.PartnerOrganization', blank=True), - ), - migrations.AlterField( - model_name='trip', - name='pcas', - field=models.ManyToManyField(to='partners.PCA', verbose_name='Related Interventions', blank=True), - ), - ] diff --git a/EquiTrack/trips/migrations/0014_auto_20160510_1432.py b/EquiTrack/trips/migrations/0014_auto_20160510_1432.py deleted file mode 100644 index dc592d113d..0000000000 --- a/EquiTrack/trips/migrations/0014_auto_20160510_1432.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -def migrate_partners(apps, schema_editor): - - Trip = apps.get_model("trips", "Trip") - LinkedPartner = apps.get_model("trips", "LinkedPartner") - - for trip in Trip.objects.all(): - - for intervention in trip.pcas.all(): - link, created = LinkedPartner.objects.get_or_create( - trip=trip, - partner=intervention.partner, - intervention=intervention - ) - if created: - print 'Linked Intervention {} to Trip {}'.format( - intervention.number.encode('utf8'), trip.id - ) - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0013_auto_20160428_1249'), - ] - - operations = [ - migrations.RunPython(migrate_partners) - ] diff --git a/EquiTrack/trips/migrations/0015_auto_20160526_1916.py b/EquiTrack/trips/migrations/0015_auto_20160526_1916.py deleted file mode 100644 index 13c2e6c594..0000000000 --- a/EquiTrack/trips/migrations/0015_auto_20160526_1916.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import smart_selects.db_fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0014_auto_20160510_1432'), - ] - - operations = [ - migrations.AlterField( - model_name='linkedpartner', - name='result', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'intervention', chained_field=b'intervention', blank=True, auto_choose=True, to='partners.RAMIndicator', null=True), - ), - ] diff --git a/EquiTrack/trips/migrations/0016_auto_20160607_2237.py b/EquiTrack/trips/migrations/0016_auto_20160607_2237.py deleted file mode 100644 index b291a628ce..0000000000 --- a/EquiTrack/trips/migrations/0016_auto_20160607_2237.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('trips', '0015_auto_20160526_1916'), - ] - - operations = [ - migrations.AlterModelOptions( - name='triplocation', - options={'ordering': ['id']}, - ), - migrations.AddField( - model_name='actionpoint', - name='follow_up', - field=models.BooleanField(default=False), - ), - ] diff --git a/EquiTrack/trips/migrations/0017_linkedgovernmentpartner.py b/EquiTrack/trips/migrations/0017_linkedgovernmentpartner.py deleted file mode 100644 index 1c7a852e16..0000000000 --- a/EquiTrack/trips/migrations/0017_linkedgovernmentpartner.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import smart_selects.db_fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0060_auto_20160721_2313'), - ('trips', '0016_auto_20160607_2237'), - ] - - operations = [ - migrations.CreateModel( - name='LinkedGovernmentPartner', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('intervention', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'partner', related_name='trips', chained_field=b'partner', blank=True, auto_choose=True, to='partners.GovernmentIntervention', null=True)), - ('partner', models.ForeignKey(to='partners.PartnerOrganization')), - ('result', smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'intervention', chained_field=b'intervention', blank=True, auto_choose=True, to='partners.GovernmentInterventionResult', null=True)), - ('trip', models.ForeignKey(to='trips.Trip')), - ], - ), - migrations.RemoveField( - model_name='linkedpartner', - name='result', - ), - ] diff --git a/EquiTrack/trips/migrations/0018_linkedpartner_result.py b/EquiTrack/trips/migrations/0018_linkedpartner_result.py deleted file mode 100644 index 507070c7de..0000000000 --- a/EquiTrack/trips/migrations/0018_linkedpartner_result.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import smart_selects.db_fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('partners', '0060_auto_20160721_2313'), - ('trips', '0017_linkedgovernmentpartner'), - ] - - operations = [ - migrations.AddField( - model_name='linkedpartner', - name='result', - field=smart_selects.db_fields.ChainedForeignKey(chained_model_field=b'partnership', chained_field=b'intervention', blank=True, auto_choose=True, to='partners.ResultChain', null=True), - ), - ] diff --git a/EquiTrack/users/migrations/0001_initial.py b/EquiTrack/users/migrations/0001_initial.py index ef35064d06..71c8cb7954 100644 --- a/EquiTrack/users/migrations/0001_initial.py +++ b/EquiTrack/users/migrations/0001_initial.py @@ -1,13 +1,19 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-09 22:22 from __future__ import unicode_literals -from django.db import models, migrations +from decimal import Decimal from django.conf import settings +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion import tenant_schemas.postgresql_backend.base class Migration(migrations.Migration): + initial = True + dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -16,51 +22,61 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Country', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('domain_url', models.CharField(unique=True, max_length=128)), - ('schema_name', models.CharField(unique=True, max_length=63, validators=[tenant_schemas.postgresql_backend.base._check_schema_name])), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('domain_url', models.CharField(max_length=128, unique=True)), + ('schema_name', models.CharField(max_length=63, unique=True, validators=[tenant_schemas.postgresql_backend.base._check_schema_name])), ('name', models.CharField(max_length=100)), + ('country_short_code', models.CharField(blank=True, max_length=10, null=True)), + ('business_area_code', models.CharField(blank=True, max_length=10, null=True)), + ('latitude', models.DecimalField(blank=True, decimal_places=5, max_digits=8, null=True, validators=[django.core.validators.MinValueValidator(Decimal('-90')), django.core.validators.MaxValueValidator(Decimal('90'))])), + ('longitude', models.DecimalField(blank=True, decimal_places=5, max_digits=8, null=True, validators=[django.core.validators.MinValueValidator(Decimal('-180')), django.core.validators.MaxValueValidator(Decimal('180'))])), + ('initial_zoom', models.IntegerField(default=8)), + ('vision_sync_enabled', models.BooleanField(default=True)), + ('vision_last_synced', models.DateTimeField(blank=True, null=True)), ], options={ 'abstract': False, }, - bases=(models.Model,), ), migrations.CreateModel( name='Office', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=254)), - ('zonal_chief', models.ForeignKey(related_name='offices', verbose_name=b'Chief', blank=True, to=settings.AUTH_USER_MODEL, null=True)), + ('zonal_chief', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='offices', to=settings.AUTH_USER_MODEL, verbose_name=b'Chief')), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='Section', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=50)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50, unique=True)), ], - options={ - }, - bases=(models.Model,), ), migrations.CreateModel( name='UserProfile', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('job_title', models.CharField(max_length=255, null=True, blank=True)), - ('phone_number', models.CharField(max_length=20, null=True, blank=True)), - ('installation_id', models.CharField(max_length=50, null=True, verbose_name=b'Device ID', blank=True)), - ('country', models.ForeignKey(blank=True, to='users.Country', null=True)), - ('office', models.ForeignKey(blank=True, to='users.Office', null=True)), - ('section', models.ForeignKey(blank=True, to='users.Section', null=True)), - ('user', models.OneToOneField(related_name='profile', to=settings.AUTH_USER_MODEL)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('partner_staff_member', models.IntegerField(blank=True, null=True)), + ('job_title', models.CharField(blank=True, max_length=255, null=True)), + ('phone_number', models.CharField(blank=True, max_length=20, null=True)), + ('installation_id', models.CharField(blank=True, max_length=50, null=True, verbose_name=b'Device ID')), + ('countries_available', models.ManyToManyField(blank=True, related_name='accessible_by', to='users.Country')), + ('country', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='users.Country')), + ('country_override', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='country_override', to='users.Country')), + ('office', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='users.Office')), + ('section', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='users.Section')), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)), ], - options={ - }, - bases=(models.Model,), + ), + migrations.AddField( + model_name='country', + name='offices', + field=models.ManyToManyField(related_name='offices', to='users.Office'), + ), + migrations.AddField( + model_name='country', + name='sections', + field=models.ManyToManyField(related_name='sections', to='users.Section'), ), ] diff --git a/EquiTrack/users/migrations/0002_userprofile_country_override.py b/EquiTrack/users/migrations/0002_userprofile_country_override.py deleted file mode 100644 index 05e7b6a989..0000000000 --- a/EquiTrack/users/migrations/0002_userprofile_country_override.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='userprofile', - name='country_override', - field=models.ForeignKey(related_name='country_override', blank=True, to='users.Country', null=True), - preserve_default=True, - ), - ] diff --git a/EquiTrack/users/migrations/0003_country_override.py b/EquiTrack/users/migrations/0003_country_override.py deleted file mode 100644 index 266ee640fb..0000000000 --- a/EquiTrack/users/migrations/0003_country_override.py +++ /dev/null @@ -1,29 +0,0 @@ -from __future__ import unicode_literals - -from django.db import models, migrations - - -def updateCountryOverride(apps, schema_editor): - - UserProfile = apps.get_model("users", "UserProfile") - for profile in UserProfile.objects.all(): - if profile.country and profile.country.name == "UAT": - profile.country_override = profile.country - profile.save() - - - -def revert(apps, schema_editor): - - raise RuntimeError("reversing this migration not possible") - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0002_userprofile_country_override'), - ] - - operations = [ - migrations.RunPython(updateCountryOverride, reverse_code=revert), - ] diff --git a/EquiTrack/users/migrations/0004_userprofile_partner_staff_member.py b/EquiTrack/users/migrations/0004_userprofile_partner_staff_member.py deleted file mode 100644 index e23d18bea1..0000000000 --- a/EquiTrack/users/migrations/0004_userprofile_partner_staff_member.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0003_country_override'), - ] - - operations = [ - migrations.AddField( - model_name='userprofile', - name='partner_staff_member', - field=models.IntegerField(null=True, blank=True), - ), - ] diff --git a/EquiTrack/users/migrations/0005_country_buisness_area_code.py b/EquiTrack/users/migrations/0005_country_buisness_area_code.py deleted file mode 100644 index ffd4eb1ed5..0000000000 --- a/EquiTrack/users/migrations/0005_country_buisness_area_code.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0004_userprofile_partner_staff_member'), - ] - - operations = [ - migrations.AddField( - model_name='country', - name='buisness_area_code', - field=models.IntegerField(default=0), - ), - ] diff --git a/EquiTrack/users/migrations/0006_auto_20160204_1237.py b/EquiTrack/users/migrations/0006_auto_20160204_1237.py deleted file mode 100644 index 508418ce61..0000000000 --- a/EquiTrack/users/migrations/0006_auto_20160204_1237.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0005_country_buisness_area_code'), - ] - - operations = [ - migrations.AlterField( - model_name='country', - name='buisness_area_code', - field=models.CharField(max_length=10, null=True, blank=True), - ), - ] diff --git a/EquiTrack/users/migrations/0007_auto_20160205_2230.py b/EquiTrack/users/migrations/0007_auto_20160205_2230.py deleted file mode 100644 index daef572d11..0000000000 --- a/EquiTrack/users/migrations/0007_auto_20160205_2230.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0006_auto_20160204_1237'), - ] - - operations = [ - migrations.RenameField( - model_name='country', - old_name='buisness_area_code', - new_name='business_area_code', - ), - ] diff --git a/EquiTrack/users/migrations/0008_userprofile_countries_available.py b/EquiTrack/users/migrations/0008_userprofile_countries_available.py deleted file mode 100644 index b89a3cf032..0000000000 --- a/EquiTrack/users/migrations/0008_userprofile_countries_available.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0007_auto_20160205_2230'), - ] - - operations = [ - migrations.AddField( - model_name='userprofile', - name='countries_available', - field=models.ManyToManyField(related_name='accessible_by', to='users.Country', blank=True), - ), - ] diff --git a/EquiTrack/users/migrations/0009_countries_available.py b/EquiTrack/users/migrations/0009_countries_available.py deleted file mode 100644 index 329b22371e..0000000000 --- a/EquiTrack/users/migrations/0009_countries_available.py +++ /dev/null @@ -1,40 +0,0 @@ -from __future__ import unicode_literals - -from django.db import models, migrations - - -def updateCountriesAvailable(apps, schema_editor): - """ - Make sure every user has their own countries available - """ - - UserProfile = apps.get_model("users", "UserProfile") - Country = apps.get_model("users", "Country") - countries = Country.objects.all() - - for profile in UserProfile.objects.all(): - if profile.user.is_superuser: - # for superusers add all countries - profile.countries_available = [c for c in countries] - - elif profile.user.is_staff and \ - profile.country: - profile.countries_available.add(profile.country) - - profile.save() - - -def revert(apps, schema_editor): - - raise RuntimeError("reversing this migration not possible") - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0008_userprofile_countries_available'), - ] - - operations = [ - migrations.RunPython(updateCountriesAvailable, reverse_code=revert), - ] diff --git a/EquiTrack/users/migrations/0010_auto_20160216_1814.py b/EquiTrack/users/migrations/0010_auto_20160216_1814.py deleted file mode 100644 index 7ea9e47a6d..0000000000 --- a/EquiTrack/users/migrations/0010_auto_20160216_1814.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0009_countries_available'), - ] - - operations = [ - migrations.AddField( - model_name='country', - name='initial_zoom', - field=models.IntegerField(default=8), - ), - migrations.AddField( - model_name='country', - name='latitude', - field=models.DecimalField(null=True, max_digits=8, decimal_places=6, blank=True), - ), - migrations.AddField( - model_name='country', - name='longitude', - field=models.DecimalField(null=True, max_digits=8, decimal_places=6, blank=True), - ), - ] diff --git a/EquiTrack/users/migrations/0011_auto_20160313_1241.py b/EquiTrack/users/migrations/0011_auto_20160313_1241.py deleted file mode 100644 index c36e1cbfde..0000000000 --- a/EquiTrack/users/migrations/0011_auto_20160313_1241.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0010_auto_20160216_1814'), - ] - - operations = [ - migrations.AddField( - model_name='country', - name='country_short_code', - field=models.CharField(max_length=10, null=True, blank=True), - ), - migrations.AddField( - model_name='country', - name='vision_sync_enabled', - field=models.BooleanField(default=True), - ), - ] diff --git a/EquiTrack/users/migrations/0012_country_vision_last_synced.py b/EquiTrack/users/migrations/0012_country_vision_last_synced.py deleted file mode 100644 index a54970e904..0000000000 --- a/EquiTrack/users/migrations/0012_country_vision_last_synced.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0011_auto_20160313_1241'), - ] - - operations = [ - migrations.AddField( - model_name='country', - name='vision_last_synced', - field=models.DateTimeField(null=True, blank=True), - ), - ] diff --git a/EquiTrack/users/migrations/0013_auto_20160509_2148.py b/EquiTrack/users/migrations/0013_auto_20160509_2148.py deleted file mode 100644 index c61e4a7385..0000000000 --- a/EquiTrack/users/migrations/0013_auto_20160509_2148.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0012_country_vision_last_synced'), - ] - - operations = [ - migrations.AddField( - model_name='country', - name='offices', - field=models.ManyToManyField(related_name='offices', to='users.Office'), - ), - migrations.AddField( - model_name='country', - name='sections', - field=models.ManyToManyField(related_name='sections', to='users.Section'), - ), - ] diff --git a/EquiTrack/users/migrations/0014_auto_20160816_2228.py b/EquiTrack/users/migrations/0014_auto_20160816_2228.py deleted file mode 100644 index 545f9b66fc..0000000000 --- a/EquiTrack/users/migrations/0014_auto_20160816_2228.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -from decimal import Decimal -import django.core.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0013_auto_20160509_2148'), - ] - - operations = [ - migrations.AlterField( - model_name='country', - name='latitude', - field=models.DecimalField(blank=True, null=True, max_digits=8, decimal_places=5, validators=[django.core.validators.MinValueValidator(Decimal('-90')), django.core.validators.MaxValueValidator(Decimal('90'))]), - ), - migrations.AlterField( - model_name='country', - name='longitude', - field=models.DecimalField(blank=True, null=True, max_digits=8, decimal_places=5, validators=[django.core.validators.MinValueValidator(Decimal('-180')), django.core.validators.MaxValueValidator(Decimal('180'))]), - ), - ] diff --git a/EquiTrack/users/migrations/__init__.py b/EquiTrack/users/migrations/__init__.py index b10c32b70b..e69de29bb2 100644 --- a/EquiTrack/users/migrations/__init__.py +++ b/EquiTrack/users/migrations/__init__.py @@ -1 +0,0 @@ -__author__ = 'jcranwellward' diff --git a/EquiTrack/vision/migrations/0001_initial.py b/EquiTrack/vision/migrations/0001_initial.py index 88ada412cb..9c670d25bb 100644 --- a/EquiTrack/vision/migrations/0001_initial.py +++ b/EquiTrack/vision/migrations/0001_initial.py @@ -1,27 +1,31 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-09 22:23 from __future__ import unicode_literals from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): + initial = True + dependencies = [ - ('users', '0012_country_vision_last_synced'), + ('users', '0001_initial'), ] operations = [ migrations.CreateModel( name='VisionSyncLog', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('handler_name', models.CharField(max_length=50)), ('total_records', models.IntegerField(default=0)), ('total_processed', models.IntegerField(default=0)), ('successful', models.BooleanField(default=False)), - ('exception_message', models.TextField(null=True, blank=True)), + ('exception_message', models.TextField(blank=True, null=True)), ('date_processed', models.DateTimeField(auto_now=True)), - ('country', models.ForeignKey(to='users.Country')), + ('country', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Country')), ], ), ] diff --git a/EquiTrack/workplan/migrations/0001_initial.py b/EquiTrack/workplan/migrations/0001_initial.py index a983a0a0e5..87a7888553 100644 --- a/EquiTrack/workplan/migrations/0001_initial.py +++ b/EquiTrack/workplan/migrations/0001_initial.py @@ -1,33 +1,37 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-09 22:23 from __future__ import unicode_literals +from django.conf import settings +import django.contrib.postgres.fields.jsonb from django.db import migrations, models -import jsonfield.fields +import django.db.models.deletion import django.utils.timezone -from django.conf import settings import model_utils.fields class Migration(migrations.Migration): + initial = True + dependencies = [ - ('users', '0014_auto_20160816_2228'), + ('reports', '0001_initial'), + ('users', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('reports', '0024_auto_20161005_2137'), - ('partners', '0072_partnerorganization_hact_values'), - ('locations', '0006_auto_20160229_1545'), + ('locations', '0001_initial'), + ('partners', '0001_initial'), ] operations = [ migrations.CreateModel( name='Comment', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), ('text', models.TextField()), - ('author', models.ForeignKey(related_name='comments', to=settings.AUTH_USER_MODEL)), - ('tagged_users', models.ManyToManyField(related_name='_comment_tagged_users_+', to=settings.AUTH_USER_MODEL, blank=True)), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to=settings.AUTH_USER_MODEL)), + ('tagged_users', models.ManyToManyField(blank=True, related_name='_comment_tagged_users_+', to=settings.AUTH_USER_MODEL)), ], options={ 'abstract': False, @@ -36,36 +40,36 @@ class Migration(migrations.Migration): migrations.CreateModel( name='CoverPage', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('national_priority', models.CharField(max_length=255)), ('responsible_government_entity', models.CharField(max_length=255)), ('planning_assumptions', models.TextField()), - ('logo', models.ImageField(height_field=b'logo_height', width_field=b'logo_width', null=True, upload_to=b'', blank=True)), + ('logo', models.ImageField(blank=True, height_field=b'logo_height', null=True, upload_to=b'', width_field=b'logo_width')), ], ), migrations.CreateModel( name='CoverPageBudget', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('from_date', models.DateField()), ('to_date', models.DateField()), ('total_amount', models.CharField(max_length=64)), ('funded_amount', models.CharField(max_length=64)), ('unfunded_amount', models.CharField(max_length=64)), - ('cover_page', models.ForeignKey(related_name='budgets', to='workplan.CoverPage')), + ('cover_page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='budgets', to='workplan.CoverPage')), ], ), migrations.CreateModel( name='Label', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(unique=True, max_length=32)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=32, unique=True)), ], ), migrations.CreateModel( name='Quarter', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=64)), ('start_date', models.DateTimeField()), ('end_date', models.DateTimeField()), @@ -74,57 +78,57 @@ class Migration(migrations.Migration): migrations.CreateModel( name='ResultWorkplanProperty', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('assumptions', models.TextField(null=True, blank=True)), - ('status', models.CharField(blank=True, max_length=255, null=True, choices=[(b'On Track', b'On Track'), (b'Constrained', b'Constrained'), (b'No Progress', b'No Progress'), (b'Target Met', b'Target Met')])), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('assumptions', models.TextField(blank=True, null=True)), + ('status', models.CharField(blank=True, choices=[(b'On Track', b'On Track'), (b'Constrained', b'Constrained'), (b'No Progress', b'No Progress'), (b'Target Met', b'Target Met')], max_length=255, null=True)), ('prioritized', models.BooleanField(default=False)), - ('metadata', jsonfield.fields.JSONField(null=True, blank=True)), - ('other_partners', models.CharField(max_length=2048, null=True, blank=True)), - ('rr_funds', models.PositiveIntegerField(null=True, blank=True)), - ('or_funds', models.PositiveIntegerField(null=True, blank=True)), - ('ore_funds', models.PositiveIntegerField(null=True, blank=True)), - ('total_funds', models.PositiveIntegerField(null=True, blank=True)), + ('metadata', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), + ('other_partners', models.CharField(blank=True, max_length=2048, null=True)), + ('rr_funds', models.PositiveIntegerField(blank=True, null=True)), + ('or_funds', models.PositiveIntegerField(blank=True, null=True)), + ('ore_funds', models.PositiveIntegerField(blank=True, null=True)), + ('total_funds', models.PositiveIntegerField(blank=True, null=True)), ('geotag', models.ManyToManyField(related_name='_resultworkplanproperty_geotag_+', to='locations.Location')), ('labels', models.ManyToManyField(to='workplan.Label')), ('partners', models.ManyToManyField(related_name='_resultworkplanproperty_partners_+', to='partners.PartnerOrganization')), ('responsible_persons', models.ManyToManyField(related_name='_resultworkplanproperty_responsible_persons_+', to=settings.AUTH_USER_MODEL)), - ('result', models.ForeignKey(related_name='workplan_properties', to='reports.Result')), + ('result', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workplan_properties', to='reports.Result')), ('sections', models.ManyToManyField(related_name='_resultworkplanproperty_sections_+', to='users.Section')), ], ), migrations.CreateModel( name='Workplan', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('status', models.CharField(blank=True, max_length=32, null=True, choices=[(b'On Track', b'On Track'), (b'Constrained', b'Constrained'), (b'No Progress', b'No Progress'), (b'Target Met', b'Target Met')])), - ('country_programme', models.ForeignKey(to='reports.CountryProgramme')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('status', models.CharField(blank=True, choices=[(b'On Track', b'On Track'), (b'Constrained', b'Constrained'), (b'No Progress', b'No Progress'), (b'Target Met', b'Target Met')], max_length=32, null=True)), + ('country_programme', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reports.CountryProgramme')), ], ), migrations.CreateModel( name='WorkplanProject', fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('workplan', models.ForeignKey(related_name='workplan_projects', to='workplan.Workplan')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('workplan', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workplan_projects', to='workplan.Workplan')), ], ), migrations.AddField( model_name='resultworkplanproperty', name='workplan', - field=models.OneToOneField(to='workplan.Workplan'), + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='workplan.Workplan'), ), migrations.AddField( model_name='quarter', name='workplan', - field=models.ForeignKey(related_name='quarters', to='workplan.Workplan'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='quarters', to='workplan.Workplan'), ), migrations.AddField( model_name='coverpage', name='workplan_project', - field=models.OneToOneField(related_name='cover_page', to='workplan.WorkplanProject'), + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='cover_page', to='workplan.WorkplanProject'), ), migrations.AddField( model_name='comment', name='workplan', - field=models.ForeignKey(related_name='comments', to='workplan.Workplan'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='workplan.Workplan'), ), ] diff --git a/EquiTrack/workplan/migrations/0002_auto_20161027_2038.py b/EquiTrack/workplan/migrations/0002_auto_20161027_2038.py deleted file mode 100644 index 2adec44203..0000000000 --- a/EquiTrack/workplan/migrations/0002_auto_20161027_2038.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.10 on 2016-10-27 17:38 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('workplan', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='resultworkplanproperty', - name='metadata', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - ]