Skip to content

Commit 4a2b7bc

Browse files
Feature/dhb 466 network characteristics (#263)
* Added the Network Characteristics journey (currently as a link on the dashboard, to be placed rightly later) * Added features for NetworkCharacteristics saving against hnId * Added cross-site request forgery token validation * fixed routing in HeatNetworkType * fixed GetAsync error that blocked from accessing HeatNetwork detail page
1 parent 2a7f960 commit 4a2b7bc

File tree

6 files changed

+296
-10
lines changed

6 files changed

+296
-10
lines changed

HNTAS/HNTAS.Api.Client/HNTAS.Api.Client.sln

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2012
33
VisualStudioVersion = 12.0.0.0
44
MinimumVisualStudioVersion = 10.0.0.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HNTAS.Api.Client", "src\HNTAS.Api.Client\HNTAS.Api.Client.csproj", "{929E20D9-34CE-4849-A1AF-48B82CD5A07B}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HNTAS.Api.Client", "src\HNTAS.Api.Client\HNTAS.Api.Client.csproj", "{977FA33F-17BC-4BD4-8A5F-65D849208BA3}"
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HNTAS.Api.Client.Test", "src\HNTAS.Api.Client.Test\HNTAS.Api.Client.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
88
EndProject
@@ -12,10 +12,10 @@ Global
1212
Release|Any CPU = Release|Any CPU
1313
EndGlobalSection
1414
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15-
{929E20D9-34CE-4849-A1AF-48B82CD5A07B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16-
{929E20D9-34CE-4849-A1AF-48B82CD5A07B}.Debug|Any CPU.Build.0 = Debug|Any CPU
17-
{929E20D9-34CE-4849-A1AF-48B82CD5A07B}.Release|Any CPU.ActiveCfg = Release|Any CPU
18-
{929E20D9-34CE-4849-A1AF-48B82CD5A07B}.Release|Any CPU.Build.0 = Release|Any CPU
15+
{977FA33F-17BC-4BD4-8A5F-65D849208BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16+
{977FA33F-17BC-4BD4-8A5F-65D849208BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
17+
{977FA33F-17BC-4BD4-8A5F-65D849208BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
18+
{977FA33F-17BC-4BD4-8A5F-65D849208BA3}.Release|Any CPU.Build.0 = Release|Any CPU
1919
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2020
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
2121
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU

HNTAS/HNTAS.Api.Client/api/openapi.yaml

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3671,10 +3671,18 @@ components:
36713671
status: InProgress
36723672
updatedAt: 2000-01-23T04:56:07.000+00:00
36733673
networkCharacteristics:
3674-
createdAt: 2000-01-23T04:56:07.000+00:00
3674+
isSupplyingOtherHeatNetworks: true
36753675
updatedBy: updatedBy
3676+
hasCommercialConnections: true
3677+
numberOfCommunalFloors: 5
3678+
createdAt: 2000-01-23T04:56:07.000+00:00
3679+
heatGenerationSourceFor: heatGenerationSourceFor
36763680
createdBy: createdBy
3681+
containsPressureBreak: true
3682+
id: id
3683+
heatNetworkType: CityScaleDistrictHeatingNetwork
36773684
status: InProgress
3685+
isSuppliedByADistrictHeatNetwork: true
36783686
updatedAt: 2000-01-23T04:56:07.000+00:00
36793687
networkElements:
36803688
createdAt: 2000-01-23T04:56:07.000+00:00
@@ -4253,15 +4261,44 @@ components:
42534261
type: object
42544262
NetworkCharacteristicsResponse:
42554263
example:
4256-
createdAt: 2000-01-23T04:56:07.000+00:00
4264+
isSupplyingOtherHeatNetworks: true
42574265
updatedBy: updatedBy
4266+
hasCommercialConnections: true
4267+
numberOfCommunalFloors: 5
4268+
createdAt: 2000-01-23T04:56:07.000+00:00
4269+
heatGenerationSourceFor: heatGenerationSourceFor
42584270
createdBy: createdBy
4271+
containsPressureBreak: true
4272+
id: id
4273+
heatNetworkType: CityScaleDistrictHeatingNetwork
42594274
status: InProgress
4275+
isSuppliedByADistrictHeatNetwork: true
42604276
updatedAt: 2000-01-23T04:56:07.000+00:00
42614277
nullable: true
42624278
properties:
42634279
status:
42644280
$ref: "#/components/schemas/NetworkDetailsStatus"
4281+
id:
4282+
nullable: true
4283+
type: string
4284+
heatNetworkType:
4285+
$ref: "#/components/schemas/HeatNetworkType"
4286+
heatGenerationSourceFor:
4287+
nullable: true
4288+
type: string
4289+
numberOfCommunalFloors:
4290+
format: int32
4291+
nullable: true
4292+
type: integer
4293+
containsPressureBreak:
4294+
nullable: true
4295+
type: boolean
4296+
isSupplyingOtherHeatNetworks:
4297+
type: boolean
4298+
hasCommercialConnections:
4299+
type: boolean
4300+
isSuppliedByADistrictHeatNetwork:
4301+
type: boolean
42654302
createdAt:
42664303
format: date-time
42674304
type: string

HNTAS/HNTAS.Api.Client/docs/models/NetworkCharacteristicsResponse.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
77
**Status** | **NetworkDetailsStatus** | | [optional]
8+
**Id** | **string** | | [optional]
9+
**HeatNetworkType** | **HeatNetworkType** | | [optional]
10+
**HeatGenerationSourceFor** | **string** | | [optional]
11+
**NumberOfCommunalFloors** | **int** | | [optional]
12+
**ContainsPressureBreak** | **bool** | | [optional]
13+
**IsSupplyingOtherHeatNetworks** | **bool** | | [optional]
14+
**HasCommercialConnections** | **bool** | | [optional]
15+
**IsSuppliedByADistrictHeatNetwork** | **bool** | | [optional]
816
**CreatedAt** | **DateTimeOffset** | | [optional]
917
**CreatedBy** | **string** | | [optional]
1018
**UpdatedAt** | **DateTimeOffset** | | [optional]

0 commit comments

Comments
 (0)