Skip to content

Feature/dev to test 486 502#275

Closed
SushreeM-DESNZ wants to merge 112 commits intotestfrom
feature/devToTest-486-502
Closed

Feature/dev to test 486 502#275
SushreeM-DESNZ wants to merge 112 commits intotestfrom
feature/devToTest-486-502

Conversation

@SushreeM-DESNZ
Copy link
Collaborator

  • merging bug fixes for 486, 502

SManokaran90 and others added 30 commits August 6, 2025 16:54
…-overseas-organisation-details

Feature/dhb 168 other or overseas organisation details
* Update README.md

* Update Dockerfile

* Revert "Update Dockerfile"

* Update appsettings.json

* Update Program.cs

* loggers

* Deleted the files

* Updated appsettings files with lower case

* Update appsettings.qa.json

* Rename appsettings.qa.json to appsettings.QA.json

* Revert "Test file change"

* Accessibility Issues and added back button and added required all the fields in the address

* Revert "resolved conflicts with dev"

This reverts commit 7f72108.

* fix for HN Location name

---------

Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>
* Bug-181 fixed

* reverted a few changes

* reverted a few changes

---------

Co-authored-by: SManokaran90 <sivasankar.manokaran@energysecurity.gov.uk>
* Added Unit testing for Home controller, Organisation contoller

* Unit testing changes

* Unit tests added for HeatNetworkController

---------

Co-authored-by: Sivasankar Manokaran <Sivasankar.Manokaran@energysecurity.gov.uk>
* Update README.md

* Update Dockerfile

* Revert "Update Dockerfile"

* Update appsettings.json

* Update Program.cs

* loggers

* Deleted the files

* Updated appsettings files with lower case

* Update appsettings.qa.json

* Rename appsettings.qa.json to appsettings.QA.json

* Revert "Test file change"

* Feature/dhb 168 other or overseas organisation details (#88)

* Accessibility fixes

* resolved conflicts with dev

* Accessibility Issues and added back button and added required all the fields in the address

* Accessibility Issues and added back button and added required all the fields in the address (#87)

* Revert "resolved conflicts with dev"

This reverts commit 7f72108.

* fix for HN Location name

---------

Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>

* Bug-181 fixed

* reverted a few changes

* reverted a few changes

* bug fixed

* removed condition on backButton navigation on EnterHNName page

---------

Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
Co-authored-by: Sivasankar Manokaran <Sivasankar.Manokaran@energysecurity.gov.uk>
* Update README.md

* Update Dockerfile

* Revert "Update Dockerfile"

* Update appsettings.json

* Update Program.cs

* loggers

* Deleted the files

* Updated appsettings files with lower case

* Update appsettings.qa.json

* Rename appsettings.qa.json to appsettings.QA.json

* Revert "Test file change"

* Feature/dhb 168 other or overseas organisation details (#88)

* Accessibility fixes

* resolved conflicts with dev

* Accessibility Issues and added back button and added required all the fields in the address

* Accessibility Issues and added back button and added required all the fields in the address (#87)

* Revert "resolved conflicts with dev"

This reverts commit 7f72108.

* fix for HN Location name

---------

Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>

* Bug-181 fixed

* reverted a few changes

* reverted a few changes

* bug fixed

* removed condition on backButton navigation on EnterHNName page

* Code modification for more appropriate logic

* code modification

---------

Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
Co-authored-by: Sivasankar Manokaran <Sivasankar.Manokaran@energysecurity.gov.uk>
* Update README.md

* Update Dockerfile

* Revert "Update Dockerfile"

* Update appsettings.json

* Update Program.cs

* loggers

* Deleted the files

* Updated appsettings files with lower case

* Update appsettings.qa.json

* Rename appsettings.qa.json to appsettings.QA.json

* Revert "Test file change"

* Feature/dhb 168 other or overseas organisation details (#88)

* Accessibility fixes

* resolved conflicts with dev

* Accessibility Issues and added back button and added required all the fields in the address

* Accessibility Issues and added back button and added required all the fields in the address (#87)

* Revert "resolved conflicts with dev"

This reverts commit 7f72108.

* fix for HN Location name

---------

Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>

* Bug-181 fixed

* reverted a few changes

* reverted a few changes

* Feature/bug 181 (#91)

* Accessibility fixes

* resolved conflicts with dev

* Accessibility Issues and added back button and added required all the fields in the address (#87)

* Feature/dhb 168 other or overseas organisation details (#89)

* Update README.md

* Update Dockerfile

* Revert "Update Dockerfile"

* Update appsettings.json

* Update Program.cs

* loggers

* Deleted the files

* Updated appsettings files with lower case

* Update appsettings.qa.json

* Rename appsettings.qa.json to appsettings.QA.json

* Revert "Test file change"

* Accessibility Issues and added back button and added required all the fields in the address

* Revert "resolved conflicts with dev"

This reverts commit 7f72108.

* fix for HN Location name

---------

Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>

* Bug-181 fixed

* reverted a few changes

* reverted a few changes

* Bug-181 fixed (#90)

* Bug-181 fixed

* reverted a few changes

* reverted a few changes

---------

Co-authored-by: SManokaran90 <sivasankar.manokaran@energysecurity.gov.uk>

---------

Co-authored-by: SManokaran90 <sivasankar.manokaran@energysecurity.gov.uk>
Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>

* Bug/fix for dhb 187 and dhb 188 (#93)

* Accessibility fixes

* resolved conflicts with dev

* Accessibility Issues and added back button and added required all the fields in the address (#87)

* Feature/dhb 168 other or overseas organisation details (#89)

* Update README.md

* Update Dockerfile

* Revert "Update Dockerfile"

* Update appsettings.json

* Update Program.cs

* loggers

* Deleted the files

* Updated appsettings files with lower case

* Update appsettings.qa.json

* Rename appsettings.qa.json to appsettings.QA.json

* Revert "Test file change"

* Accessibility Issues and added back button and added required all the fields in the address

* Revert "resolved conflicts with dev"

This reverts commit 7f72108.

* fix for HN Location name

---------

Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>

* Bug-181 fixed (#90)

* Bug-181 fixed

* reverted a few changes

* reverted a few changes

---------

Co-authored-by: SManokaran90 <sivasankar.manokaran@energysecurity.gov.uk>

* fix for 405 error and data retention from one org type to another

---------

Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>
Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>

* bug fixed

* removed condition on backButton navigation on EnterHNName page

* Feature/unit testing hn (#96)

* Accessibility fixes

* resolved conflicts with dev

* Accessibility Issues and added back button and added required all the fields in the address (#87)

* Feature/dhb 168 other or overseas organisation details (#89)

* Update README.md

* Update Dockerfile

* Revert "Update Dockerfile"

* Update appsettings.json

* Update Program.cs

* loggers

* Deleted the files

* Updated appsettings files with lower case

* Update appsettings.qa.json

* Rename appsettings.qa.json to appsettings.QA.json

* Revert "Test file change"

* Accessibility Issues and added back button and added required all the fields in the address

* Revert "resolved conflicts with dev"

This reverts commit 7f72108.

* fix for HN Location name

---------

Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>

* Added Unit testing for Home controller, Organisation contoller

* Unit testing changes

* Bug-181 fixed (#90)

* Bug-181 fixed

* reverted a few changes

* reverted a few changes

---------

Co-authored-by: SManokaran90 <sivasankar.manokaran@energysecurity.gov.uk>

* fix for 405 error and data retention from one org type to another (#92)

* Unit tests added for HeatNetworkController

---------

Co-authored-by: SManokaran90 <sivasankar.manokaran@energysecurity.gov.uk>
Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>

* Code modification for more appropriate logic

* code modification

* corrected SessionKeys reference

---------

Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
Co-authored-by: Sivasankar Manokaran <Sivasankar.Manokaran@energysecurity.gov.uk>
* 500 will throw when access FewerThan10Dwellings

* Added 404 and updated error page

* error method update
* Added Unit testing for Home controller, Organisation contoller

* Unit testing changes

* Updated companyConfirm page

* Unit test update OrganisationControllerTests

* build fix

* Add contributor changes
Workflow validation changes

* new contributor changes

* Add new contributor changes
* added duty holder invitation, start and landing page

* added one log in after StartPage before user accesses the Dashboard

* renamed dutyholder to contributor
* Update README.md

* Update Dockerfile

* Revert "Update Dockerfile"

* Update appsettings.json

* Update Program.cs

* loggers

* Deleted the files

* Updated appsettings files with lower case

* Update appsettings.qa.json

* Rename appsettings.qa.json to appsettings.QA.json

* Revert "Test file change"

* Feature/dhb 168 other or overseas organisation details (#88)

* Accessibility fixes

* resolved conflicts with dev

* Accessibility Issues and added back button and added required all the fields in the address

* Accessibility Issues and added back button and added required all the fields in the address (#87)

* Revert "resolved conflicts with dev"

This reverts commit 7f72108.

* fix for HN Location name

---------

Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>

* Bug-181 fixed

* reverted a few changes

* reverted a few changes

* bug fixed

* removed condition on backButton navigation on EnterHNName page

* HNName page added before HNLocation

* updated all changes in content, position, navigation as per dhb-197

* all page positions and content changes done as per dhb-197 and 177

---------

Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
Co-authored-by: Sivasankar Manokaran <Sivasankar.Manokaran@energysecurity.gov.uk>
* Added Existing contributor journey changes

* session key ordered keys
* add heatnetwork fix

* changes for reject invitation
* add heatnetwork fix

* changes for reject invitation

* unit testing fix..
* Content changes

* code QL changes

* codeQL

* Delete HNTAS/.github/workflows directory
* repostioned M&E contract question page

* added hn eligibility pages & test cases
Co-authored-by: shashisk977 <shashikumar.sannakariyappa@energysecurity.gov.uk>
* added OrganisationDetails page

* added its own api call on org details page
SManokaran90 and others added 26 commits January 7, 2026 15:26
* fix for bug 400 and 399

* Adde dhb-403-404 changes
* Added accessible-autocomplete poc changes

* layout changes
* Added all features for dhb-409

* Address feature extracted and implemented in AddressController

* Added the EnergyHeatNetworkPrimaryLosses default value to carbon calculator view

* Removed mentions of outdated actions in OrganisationControllerTests
* Added all features for dhb-409

* Address feature extracted and implemented in AddressController

* Added the EnergyHeatNetworkPrimaryLosses default value to carbon calculator view

* Removed mentions of outdated actions in OrganisationControllerTests

* Added Hn address and latitude longitude to Db

* trimed the address fields

* fix for build issue, commented , need to fix the test case later

---------

Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>
* Added all features for dhb-409

* Address feature extracted and implemented in AddressController

* Added the EnergyHeatNetworkPrimaryLosses default value to carbon calculator view

* Removed mentions of outdated actions in OrganisationControllerTests

* Added Hn address and latitude longitude to Db

* trimed the address fields

* fix for build issue, commented , need to fix the test case later

* RegistrationSource changes

---------

Co-authored-by: SushreeM-DESNZ <Sushree.Mohanty@energysecurity.gov.uk>
* Cleared hn data from session upon submission, added validation to Enter Address Manually view, trimmed addressparts for ConfirmAddress view

* Fixed issue with exception thrown before HN registation submission
Fixes for 10 unit test cases
* added optional chaining in AddressManualEntry

* Added ClearSessionData at the beginning of Add HN journey, fixed missing validation for DoesHNHavePostcode view
* Network details - changes in Add network details flow, tables and initial setup for all the details

* Unit test fixes

* Scan fix

* common status enum for all network details
* Added Histroy link in the HN Details page based on the condition IS_REGISTRATION_ENABLE

* Updated Api client
* 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
* 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
* Network elements - part changes

* network elements - part changes

* network elements - part changes

* network element changes

* Network elements changes - web

* Code ql fix
Metering and monitoring strategy
Assessment plan
Design construction log
…as organisation registered, able to register organisation for user now (#273)
* updated code to hide Dashboard and Notification nav link until user has organisation registered, able to register organisation for user now

* Switched controller for contactDetails from UserDetails to Organisation
@SushreeM-DESNZ SushreeM-DESNZ deleted the feature/devToTest-486-502 branch February 26, 2026 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants