Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/country page #1972

Merged
merged 78 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
fc8d170
Add api for gdacsevent
k9845 Nov 30, 2023
046fbb9
Return all per for country
k9845 Nov 30, 2023
2b23891
Add local units data
k9845 Dec 1, 2023
560fa1c
Updatetest case for local units
k9845 Dec 1, 2023
7b451cb
Add aggregated country views
k9845 Dec 1, 2023
c0e41ec
Rename filter for region
k9845 Dec 4, 2023
a8cf1b8
add country stats api
k9845 Dec 5, 2023
376d578
Change response field in aggregation
k9845 Dec 5, 2023
2e62e88
Add links for country
k9845 Dec 11, 2023
cc8ff76
Add local units options serializers
k9845 Dec 11, 2023
4016ba9
Import data for country contact
k9845 Dec 12, 2023
754007e
Add ns directory in country
k9845 Dec 12, 2023
4e0b0a5
Add ns document data import
k9845 Dec 12, 2023
c73c836
Add api for country document
k9845 Dec 13, 2023
50eb5cb
Add country initiatives data
k9845 Dec 13, 2023
2dbc373
Add publication_date filter in GDACSEvent
k9845 Dec 13, 2023
a208fa7
Add ns capacity strengthening data
k9845 Dec 18, 2023
0b0ad0c
Add ns organizational capacity
k9845 Dec 18, 2023
98a81fa
Merge migrations
k9845 Dec 19, 2023
703fd41
Add acaps data import
k9845 Dec 19, 2023
4d2b5fb
Add type for country stats
k9845 Dec 20, 2023
4df37fe
Add api for acaps in databank
k9845 Dec 20, 2023
be68bc6
Add disaster_id in country stats api
k9845 Dec 21, 2023
9ecaca0
Add data indicator for fdrs
k9845 Dec 21, 2023
25d2355
Allow null in gdacs severity
k9845 Dec 21, 2023
cb22325
Update fdrs indicator
k9845 Dec 26, 2023
0615231
Add founded_date in country
k9845 Dec 26, 2023
2360086
Add district population data
k9845 Dec 26, 2023
e6e80bb
Add disaggregated from FDRS
k9845 Dec 27, 2023
62dcd03
Update fdrs indicator
k9845 Dec 27, 2023
cae63cf
Add total count
k9845 Dec 28, 2023
f3e4962
Add country country supporting partner
k9845 Dec 28, 2023
e4605cb
Add ICRC data for country
k9845 Jan 2, 2024
d580324
Add disasterlaw url for country
k9845 Jan 2, 2024
184fb72
Add world bank indicators data
k9845 Jan 2, 2024
a5c1677
Refactor country organizational capacity
k9845 Jan 5, 2024
3f1abea
Fix typing in databank
k9845 Jan 9, 2024
ebcbfa3
Add worldbank indicator
k9845 Jan 10, 2024
928dd90
Replace database field for world bank
k9845 Jan 11, 2024
74a2d70
Make icrc_presence OneToOneField
k9845 Jan 11, 2024
32ae0a5
Add fdrs income data
k9845 Jan 22, 2024
23c096a
Add poverty rate from world bank
k9845 Jan 22, 2024
db0cd6b
Add unicef population data
k9845 Jan 22, 2024
a98a2cf
Add hdr gii data
k9845 Jan 22, 2024
340be57
Rebase fix for local units
k9845 Jan 29, 2024
b85e1db
Add country delegation in country page
k9845 Jan 29, 2024
8e02a55
Add AutocompleteFilterFactory in local_units
k9845 Feb 1, 2024
55abf18
Add fdrs annual income for chart
k9845 Feb 2, 2024
132cd86
Add annual income for historical data
k9845 Feb 2, 2024
c33c9aa
Add requested amount in historical api
k9845 Feb 9, 2024
f2bfee4
Update local units csv file
k9845 Feb 9, 2024
939d1bd
Add KeyClimate ingestion command for country
susilnem Feb 9, 2024
39658cc
add new migration file
susilnem Feb 9, 2024
5220825
Add different serializer for historical disaster
k9845 Feb 12, 2024
3504e41
Refactor code for climate data
susilnem Feb 12, 2024
1c17ead
refactor code
k9845 Feb 13, 2024
f5db1cc
refactor code
k9845 Feb 14, 2024
af5296a
Add env variables in kubernetes
k9845 Feb 14, 2024
1010284
Add SupportedByOrganizationType in PerWorkPlanComponent
k9845 Jan 12, 2024
75d814c
Add api for per document upload
k9845 Jan 12, 2024
701dcf8
Add pdf export for per forms
k9845 Jan 12, 2024
1616066
Add excel export for per forms
k9845 Jan 16, 2024
4525b38
Add migration script for missing notes
k9845 Jan 17, 2024
cbf8e3b
Add migrations script for component parent
k9845 Jan 18, 2024
5474e69
Add filter to per-documents upload.
susilnem Jan 25, 2024
5743833
Remove multipleChoices in country filter
susilnem Jan 26, 2024
ec6278c
Fix the filter issue on swagger
susilnem Jan 26, 2024
ee163c4
minor change
susilnem Jan 26, 2024
c8bb4ca
Add EXPORT_ALLOWED_DOMAIN from env
k9845 Jan 29, 2024
871b1aa
Add migration script for component 34
k9845 Jan 30, 2024
bc55311
Add is_parent in form question api
k9845 Jan 31, 2024
78eddb9
Add question_group in FormQuestionSerializer
k9845 Feb 2, 2024
4993347
Add description fixture for per_form_question_group
k9845 Feb 8, 2024
7f3b5b8
Rename label for fdrs income
k9845 Feb 23, 2024
aabeaac
Refactor code
k9845 Feb 27, 2024
4f8561d
Rename per in export
k9845 Feb 29, 2024
78f2a20
Add country and regional permission in per document uploa
k9845 Mar 1, 2024
3ece1e3
Fix snapshots test
k9845 Mar 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
build:
machine:
# Check https://circleci.com/developer/machine/image/ubuntu-2004 for details:
image: ubuntu-2004:202201-02
image: default
docker_layer_caching: true
steps:
- checkout
Expand Down
72 changes: 72 additions & 0 deletions DO.csv

Large diffs are not rendered by default.

43 changes: 41 additions & 2 deletions api/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,11 @@ class CountryKeyFigureInline(admin.TabularInline, TranslationInlineModelAdmin):
model = models.CountryKeyFigure


class RegionKeyFigureInline(admin.TabularInline, TranslationInlineModelAdmin):
class CountryDirectoryInline(admin.TabularInline):
model = models.CountryDirectory


class RegionKeyFigureInline(admin.TabularInline):
model = models.RegionKeyFigure


Expand Down Expand Up @@ -506,6 +510,13 @@ class RegionLinkInline(admin.TabularInline):
class CountryContactInline(admin.TabularInline):
model = models.CountryContact

class CountryKeyDocumentInline(admin.TabularInline):
model = models.CountryKeyDocument


class CountryICRCPresenceInline(admin.TabularInline):
model = models.CountryICRCPresence


class RegionContactInline(admin.TabularInline):
model = models.RegionContact
Expand All @@ -520,6 +531,22 @@ class DistrictAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedA
modifiable = True


class NSDInitiativesAdmin(admin.TabularInline):
model = models.NSDInitiatives


class CountryCapacityStrengtheningAdmin(admin.TabularInline):
model = models.CountryCapacityStrengthening


class CountryOrganizationalCapacityAdmin(admin.TabularInline):
model = models.CountryOrganizationalCapacity


class CountrySupportingPartnerAdmin(admin.TabularInline):
model = models.CountrySupportingPartner


class CountryAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
country_in = 'pk__in'
list_filter = ('record_type', 'in_search', 'independent', 'disputed')
Expand All @@ -528,7 +555,19 @@ class CountryAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAd
list_editable = ('record_type',)
search_fields = ('name',)
modifiable = True
inlines = [CountryKeyFigureInline, CountrySnippetInline, CountryLinkInline, CountryContactInline]
inlines = [
CountryKeyFigureInline,
CountrySnippetInline,
CountryLinkInline,
CountryContactInline,
CountryDirectoryInline,
CountryKeyDocumentInline,
NSDInitiativesAdmin,
CountryCapacityStrengtheningAdmin,
CountryOrganizationalCapacityAdmin,
CountrySupportingPartnerAdmin,
CountryICRCPresenceInline,
]
exclude = ('key_priorities',)


Expand Down
Loading