Skip to content

Commit

Permalink
Merge branch 'main' into 137746-cyrpess-sponsored-performance
Browse files Browse the repository at this point in the history
  • Loading branch information
nwarms authored Sep 29, 2023
2 parents 095b035 + 29052c3 commit 697d40a
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ private void RePopDatePickerModelsAfterValidationFail()
}
public static decimal? CalculateGrantAmount(string type, string phase)
{
if (phase is null) return 25000;
switch (phase.ToLower())
{
case "primary":
Expand All @@ -102,20 +103,20 @@ private void RePopDatePickerModelsAfterValidationFail()
SponsoredGrantType.FastTrack => 70000,
SponsoredGrantType.Full => 110000,
SponsoredGrantType.Intermediate => 90000,
_ => 0
_ => 25000
};
case "secondary":
return type switch
{
SponsoredGrantType.FastTrack => 80000,
SponsoredGrantType.Full => 150000,
SponsoredGrantType.Intermediate => 115000,
_ => 0
_ => 25000
};
}

// Else return default £25k
return 25000;
return 25000;
}

protected UpdateAcademyConversionProject Build()
Expand Down
28 changes: 13 additions & 15 deletions terraform/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion terraform/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ No providers.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_azure_container_apps_hosting"></a> [azure\_container\_apps\_hosting](#module\_azure\_container\_apps\_hosting) | github.com/DFE-Digital/terraform-azurerm-container-apps-hosting | v1.0.0 |
| <a name="module_azure_container_apps_hosting"></a> [azure\_container\_apps\_hosting](#module\_azure\_container\_apps\_hosting) | github.com/DFE-Digital/terraform-azurerm-container-apps-hosting | v1.1.0 |
| <a name="module_azurerm_key_vault"></a> [azurerm\_key\_vault](#module\_azurerm\_key\_vault) | github.com/DFE-Digital/terraform-azurerm-key-vault-tfvars | v0.2.0 |

## Resources
Expand Down
2 changes: 1 addition & 1 deletion terraform/container-apps-hosting.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "azure_container_apps_hosting" {
source = "github.com/DFE-Digital/terraform-azurerm-container-apps-hosting?ref=v1.0.0"
source = "github.com/DFE-Digital/terraform-azurerm-container-apps-hosting?ref=v1.1.0"

environment = local.environment
project_name = local.project_name
Expand Down

0 comments on commit 697d40a

Please sign in to comment.