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.

Sign up for GitHub

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

[MODFIN-388] - add acqunitIds to finance data view #488

Merged
merged 4 commits into from
Nov 20, 2024
Merged

[MODFIN-388] - add acqunitIds to finance data view #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56906b0
add acqunitIds
azizbekxm Nov 19, 2024
176b429
add acqunitIds
azizbekxm Nov 19, 2024
197cdd8
add acqunitIds
azizbekxm Nov 19, 2024
facd7a2
Merge branch 'master' into MODFIN-388
azizbekxm Nov 20, 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
4 changes: 3 additions & 1 deletion mod-finance/examples/fy_finance_data.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
"fundTags": {
"tagList": ["Education", "Research"]
},
"fundAcqUnitIds": ["123e4567-e89b-12d3-a456-426614174006"],
"budgetId": "123e4567-e89b-12d3-a456-426614174001",
"budgetName": "Annual Budget",
"budgetStatus": "Active",
"budgetInitialAllocation": 1000000,
"budgetCurrentAllocation": 950000,
"budgetAllowableExpenditure": 80,
"budgetAllowableEncumbrance": 90
"budgetAllowableEncumbrance": 90,
"budgetAcqUnitIds": ["123e4567-e89b-12d3-a456-426614174008"]
}
8 changes: 6 additions & 2 deletions mod-finance/examples/fy_finance_data_collection.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
"fundTags": {
"tagList": ["Education", "Research"]
},
"fundAcqUnitIds": ["123e4567-e89b-12d3-a456-426614174006"],
"budgetId": "123e4567-e89b-12d3-a456-426614174001",
"budgetName": "Annual Budget",
"budgetStatus": "Active",
"budgetInitialAllocation": 1000000,
"budgetCurrentAllocation": 950000,
"budgetAllowableExpenditure": 80,
"budgetAllowableEncumbrance": 90
"budgetAllowableEncumbrance": 90,
"budgetAcqUnitIds": ["123e4567-e89b-12d3-a456-426614174008"]
},
{
"fiscalYearId": "123e4567-e89b-12d3-a456-426614174005",
Expand All @@ -30,13 +32,15 @@
"fundTags": {
"tagList": ["Science", "Innovation"]
},
"fundAcqUnitIds": ["123e4567-e89b-12d3-a456-426614174007"],
"budgetId": "123e4567-e89b-12d3-a456-426614174003",
"budgetName": "Research Budget",
"budgetStatus": "Planned",
"budgetInitialAllocation": 500000,
"budgetCurrentAllocation": 450000,
"budgetAllowableExpenditure": 70,
"budgetAllowableEncumbrance": 85
"budgetAllowableEncumbrance": 85,
"budgetAcqUnitIds": ["123e4567-e89b-12d3-a456-426614174009"]
}
],
"totalRecords": 2
Expand Down
14 changes: 14 additions & 0 deletions mod-finance/schemas/fy_finance_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
"description": "Arbitrary tags associated with this fund",
"$ref": "../../../raml-util/schemas/tags.schema"
},
"fundAcqUnitIds": {
"description": "List of acquisition unit IDs associated with the fund",
"type": "array",
"items": {
"$ref": "../../common/schemas/uuid.json"
}
},
"budgetId": {
"description": "UUID of this budget",
"$ref": "../../common/schemas/uuid.json"
Expand Down Expand Up @@ -77,6 +84,13 @@
"budgetAllowableEncumbrance": {
"description": "The encumbrance percentage limit for this budget",
"type": "number"
},
"budgetAcqUnitIds": {
"description": "List of acquisition unit IDs associated with the budget",
"type": "array",
"items": {
"$ref": "../../common/schemas/uuid.json"
}
}
},
"required": [
Expand Down
Loading