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

[ch38468] GDD scaffold Backend #3787

Open
wants to merge 49 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
fe4f270
GDD kickoff
emaciupe Sep 10, 2024
1df3927
wip
emaciupe Sep 11, 2024
1fd2f50
Merge branch 'develop' of github.com:unicef/etools into gdd-kickoff
emaciupe Sep 26, 2024
8316ca9
Merge branch 'develop' of github.com:unicef/etools into gdd-kickoff
emaciupe Oct 7, 2024
7fcf5df
GDD models
emaciupe Oct 9, 2024
27d3842
GDD models
emaciupe Oct 9, 2024
ad77b55
wip
emaciupe Oct 10, 2024
035bb07
intervention list
emaciupe Oct 10, 2024
5fd4055
rename model
robertavram Oct 10, 2024
9806a60
updates
robertavram Oct 10, 2024
af97eb1
fix migrations
robertavram Oct 10, 2024
2ce4a41
fixes
robertavram Oct 11, 2024
49afd4d
some fixes
robertavram Oct 11, 2024
0120507
update validations
robertavram Oct 11, 2024
6e43d33
changes
emaciupe Oct 11, 2024
e5f43d8
permissions
emaciupe Oct 11, 2024
9cc7208
more changes; added tests
emaciupe Oct 11, 2024
c1e36f4
models changes; results structure retrieve on gdd detail and dedicate…
emaciupe Oct 15, 2024
d21bf61
renames
emaciupe Oct 15, 2024
9332e3b
modifs
robertavram Oct 15, 2024
b3a4255
model changes
robertavram Oct 15, 2024
f6776d4
renaming after model changes
emaciupe Oct 16, 2024
e00f40c
GET /api/gdd/e-workplans/?country_programme=id
emaciupe Oct 16, 2024
adc3b94
Merge branch 'develop' into gddd
robertavram Oct 17, 2024
d9c23c9
changed partner_organization to partner; other fixes in related names…
emaciupe Oct 17, 2024
e6fc77e
Merge branch 'gddd' of github.com:unicef/etools into gddd
emaciupe Oct 17, 2024
201a4b3
dropdown-options endpoints
emaciupe Oct 17, 2024
3637b41
save progress
robertavram Oct 17, 2024
7e32076
add synchronizer
robertavram Oct 18, 2024
aca945d
Update synchronizers.py
robertavram Oct 18, 2024
9368a56
added e_workplans ids to gdd details
emaciupe Oct 18, 2024
983e0d0
POST gdd/id/result-links/
emaciupe Oct 18, 2024
0c576d4
fix cp_output_name in result_links
emaciupe Oct 18, 2024
4d1fbf2
POST api/gdd/gdds/3/key-interventions/
emaciupe Oct 18, 2024
7e42499
Added name on GDDKeyInterventionSerializer
emaciupe Oct 18, 2024
c80ad41
return gdd details on POST key-interventions
emaciupe Oct 18, 2024
85b17d0
fixes on name for GDDKeyIntervention
emaciupe Oct 18, 2024
3554a82
Merge pull request #3786 from unicef/gdd_synchronizer
emaciupe Oct 18, 2024
b9c890d
added locations on GDDActivity; merge migrations
emaciupe Oct 18, 2024
e2d2182
POST api/gdd/gdds/3/key-interventions/
emaciupe Oct 18, 2024
5bb66fe
add locations and name on GDDActivityCreateSerializer
emaciupe Oct 18, 2024
83b290d
add locations in fields
emaciupe Oct 18, 2024
d5f27a9
name added in fields
emaciupe Oct 18, 2024
80c6013
added name in gdd activity detail
emaciupe Oct 18, 2024
b393058
add action views
robertavram Oct 19, 2024
8b186cc
Update urls.py
robertavram Oct 19, 2024
8a35576
fix imports
robertavram Oct 19, 2024
b9febf2
fixes
robertavram Oct 19, 2024
c816eeb
adjust perms
robertavram Oct 19, 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
1 change: 1 addition & 0 deletions src/etools/applications/core/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def process_permissions(permission_dict):
def import_permissions(model_name):
permission_file_map = {
'Intervention': settings.PACKAGE_ROOT + '/applications/partners/permission_matrix/intervention_permissions.csv',
'GDD': settings.PACKAGE_ROOT + '/applications/governments/permission_matrix/gdd_permissions.csv',
'Agreement': settings.PACKAGE_ROOT + '/applications/partners/permission_matrix/agreement_permissions.csv',
'Assessment': settings.PACKAGE_ROOT + '/applications/psea/permission_matrix/assessment_permissions.csv',
'MonitoringActivity': settings.PACKAGE_ROOT + '/applications/field_monitoring/planning/'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 4.2.3 on 2024-10-10 23:14

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('governments', '0001_initial'),
('funds', '0002_initial'),
]

operations = [
migrations.AddField(
model_name='fundsreservationheader',
name='gdd',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='frs', to='governments.gdd', verbose_name='Government Digital Document'),
),
]
8 changes: 8 additions & 0 deletions src/etools/applications/funds/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ class FundsReservationHeader(TimeStampedModel):
null=True,
on_delete=models.CASCADE,
)
gdd = models.ForeignKey(
'governments.GDD',
verbose_name=_("Government Digital Document"),
related_name='frs',
blank=True,
null=True,
on_delete=models.CASCADE,
)
vendor_code = models.CharField(
verbose_name=_("Vendor Code"),
max_length=20,
Expand Down
Empty file.
Loading