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

PSP-9268 Add sub-interest files to a main file #4413

Merged
merged 18 commits into from
Oct 24, 2024

Conversation

asanchezr
Copy link
Collaborator

video.mp4

@asanchezr asanchezr added the enhancement New feature or request label Oct 23, 2024
@asanchezr asanchezr self-assigned this Oct 23, 2024
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

1 similar comment
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

/// </summary>
/// <param name="acquisitionFileNumber">The Acquisition File Number.</param>
/// <returns>The file number suffix (e.g. "1", "2", "3", etc) if it is found, or -1 if it is not.</returns>
private static int GetAcquisitionNumberSuffix(string acquisitionFileNumber)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to make this an Extension Method of the PimsAcquisitionFile?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah - can do that so the logic can be reused in the future

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

{
// generate file number for "sub-files"
var parentFile = Context.PimsAcquisitionFiles
.FirstOrDefault(x => x.AcquisitionFileId == acquisitionFile.PrntAcquisitionFileId) ?? throw new KeyNotFoundException();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.AsNoTracking()

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

1 similar comment
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

2 similar comments
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

@asanchezr asanchezr merged commit 1d32ca4 into bcgov:dev Oct 24, 2024
7 checks passed
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4413

@asanchezr asanchezr deleted the psp-9268-create-sub-file branch October 30, 2024 16:50
devinleighsmith added a commit that referenced this pull request Nov 7, 2024
* psp-9235 | Contact Navigation check (#4416)

* improved logic to contacts navigation checking
---------

Co-authored-by: Manuel Rodriguez <[email protected]>

* CI: Bump version to v5.6.0-91.24

* Version bump IS92 (#4418)

* Bump DEV version

* Lint fixes

* CI: Bump version to v5.6.0-92.1

* PSP-9268 Add sub-interest files to a main file (#4413)

* Inject parentId into create-acq-file route

* Update container and form to copy information from parent file to sub-files on creation

* Improve JS typing

* Add sub-interest files

* Fix bug in model mappings

* Changes to navigation from sub-files

* Fix bug when copying acquisition team from parent file into sub-file

* Backend changes to support adding sub-files

* Hide button for sub-files

* Fix bug creating sub-files

* Ask user for confirmation when changing main file project or product

* Test updates

* Fix merge conflicts

* Test updates

* PR feedback

* Fix typing error after merging another PR

* Update snapshots

* CI: Bump version to v5.6.0-92.2

* PSP-9351 UI/UX: The close button at the top right side of the sub-menu should be integrated within the header (#4414)

* PSP-9351 UI changes to side tray close button for consistency

* Update snapshots

* Test updates

* Update snapshots

* CI: Bump version to v5.6.0-92.3

* PSP-9411 : FT-REG: Lease & Licences: Header still displays "Tenant" when the lease is payable. (#4419)

Co-authored-by: Herrera <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.4

* Fixed repository not updating doc purpose (#4420)

* CI: Bump version to v5.6.0-92.5

* IS-92.00 Database Schema (#4408)

* IS-92.00 Database Schema

PSP_PIMS | Development Sprint: S92.00 | Design Sprint: 91 | Date: 2024-Oct-21
- Added tables:
  - PIMS_DOCUMENT_QUEUE
  - PIMS_DOCUMENT_QUEUE_HIST
  - PIMS_DOCUMENT_QUEUE_STATUS_TYPE
  - PIMS_SUBFILE_INTEREST_TYPE
- Altered tables:
  - PIMS_ACQUISITION_FILE
  - PIMS_ACQUISITION_FILE_HIST
  - PIMS_DOCUMENT
  - PIMS_DOCUMENT_HIST
- Added seed script:
  - 049_DML_PIMS_DATA_SOURCE_TYPE.sql
  - 157_DML_PIMS_SUBFILE_INTEREST_TYPE.sql
  - 158_DML_PIMS_DOCUMENT_QUEUE_STATUS_TYPE.sql
- Requires additional metadata to meet standards

* Added Lease/License Alters

- Regenerated master.sql

* Changed comments to work with current settings

---------

Co-authored-by: Manuel Rodriguez <[email protected]>

* CI: Bump version to v5.6.0-92.6

* Generated scaffold (#4421)

* CI: Bump version to v5.6.0-92.7

* psp-9186 prevent merging of pims and parcel map data - use pims if exists, otherwise use parcel map. (#4412)

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.8

* Changes on automation branch IS92 (#4425)

* CI: Bump version to v5.6.0-92.9

* Fix faulty logic when closing property info panel (#4424)

* CI: Bump version to v5.6.0-92.10

* PSP-9406 fix

* PSP-9252 Add date fields to acquisition file (major projects) (#4428)

* Model updates

* Include new fields in Create Acquisition form

* Show new fields on acquisition detail view

* Capture new fields in Update acquisition form

* Test updates

* Update snapshots

* CI: Bump version to v5.6.0-92.11

* PSP-9089 Warn user if they are about to lose data when cancelling "Add Document" (#4422)

* Display confirmation message before closing document upload modal

* Inject view into document upload container

* Code cleanup

* Update snapshots

* Test updates

* PR feedback

* CI: Bump version to v5.6.0-92.12

* PSP-9341 : Sub-file interest type (#4423)

* PSP-9341 : Sub-file interest type

* - test updates

* - updates

* - updates

* - test updates

---------

Co-authored-by: Herrera <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.13

* PSP-9331: UI UX Clean Up - Replace notes field (#4429)

* Changes made

* Update snapshots and unit tests

* Disposition notes and Property Details Yup updated

---------

Co-authored-by: devinleighsmith <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.14

* PSP-8596 : UI UX Clean Up - Menu order (#4430)

* PSP-8596 : UI UX Clean Up - Menu order

* PSP-8596 : UI UX Clean Up - Menu order

---------

Co-authored-by: Herrera <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.15

* PSP-9205 : UI UX Clean Up - tab menu - color replacement (#4426)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.6.0-92.16

* PSP-9412 fix

* CI: Bump version to v5.6.0-92.17

* CI: Bump version to v5.6.0-92.18

* PSP-9465 Sub interest section is missing on the view screen of Sub-interest file  (#4438)

* Add missing sub-interest section to acquisition sub-files

* Test updates

* CI: Bump version to v5.6.0-92.19

* PSP-9435 : FT-REG: Lease & Licences: Payee Header is not refreshed as soon as the user deletes the payee (#4440)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.6.0-92.20

* PSP-9205 : UI UX Clean Up - tab menu - color replacement (#4441)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.6.0-92.21

* psp-9466 ensure that the full pims location data is included in the map marker click event - since the minimal layer does not have all necessary properties. (#4445)

Signed-off-by: devinleighsmith <[email protected]>

* CI: Bump version to v5.6.0-92.22

* PSP-9474 : FT: Acquisition File: Sub-interest File: For Other file interest type Placeholder text is missing on the free text box (#4442)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.6.0-92.23

* Adding tooltip of Acquisition File Create form (#4447)

* CI: Bump version to v5.6.0-92.24

* Updated sync helper to work with new format of files. Sorting before creating json to help in comparing. Other fixes (#4444)

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.25

* PSP-9302 Leases Compensation: 500 error should throw a friendlier message when a user attempts to delete a stakeholder that is associated to a compensation (#4449)

* WIP

* Fix typo

* PSP-9302 Provide user-friendly message

* Reset lease stakeholder state when API responds with error 409

* Test updates

* Fix merge conflicts

* CI: Bump version to v5.6.0-92.26

* PSP-8720 UI-UX cleanup - Disabled Buttons (#4436)

* UI UX clean up for disabled buttons

* Update snapshots

* CI: Bump version to v5.6.0-92.27

* Psp 9318 - document queue base etl (#4443)

* psp-9318 pat_pims_document_import etl wip.

* update to new PIMS table.

* psp-9317 create base ETL to import documents from TAP.

* revert password.

---------

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.28

* PSP-8759 : Creating and Editing Property Records – Property Address F… (#4433)

* PSP-8759 : Creating and Editing Property Records – Property Address Fields

* - test updates

* - test updates

---------

Co-authored-by: Herrera <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.29

* PSP-8569 : UI UX Clean Up - Properties Menu (Acquisition, Disposition… (#4437)

* PSP-8569 : UI UX Clean Up - Properties Menu (Acquisition, Disposition & Research File)

* - updates

* Update snapshots

---------

Co-authored-by: Herrera <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.30

* Psp 9405 allow layers to be refreshed programatically. (#4439)

* psp-9405 allow updates that cause changes to map layers to be refreshed

* formatting corrections.

* mock correction.

* code review corrections.

* CI: Bump version to v5.6.0-92.31

* psp-9436, require the user to change the advanced filter for it to be… (#4434)

* psp-9436, require the user to change the advanced filter for it to be applied.
requires tests.

* psp-9436 change advanced filter so that the default filter is "always on".
- Update point clusterer to not cluster properties that are unable to display a marker.

* re-sort dependencies

---------

Co-authored-by: Smith <[email protected]>

* CI: Bump version to v5.6.0-92.32

* PSP-9488 Titles are missing on Properties links and File Summary (#4456)

* Titles are missing on Properties links and File Summary

* Update snapshots

* CI: Bump version to v5.6.0-92.33

* PSP-9489 : FT: Property Details: The default option for the Province should be "British Columbia" (#4454)

Co-authored-by: Herrera <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.34

* correct inconsistent reset of advanced filter. (#4455)

* correct inconsistent reset of advanced filter.

* test correction.

---------

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.6.0-92.35

* Updated repository to only retrieve the necessary information for a report (#4457)

* CI: Bump version to v5.6.0-92.36

---------

Signed-off-by: devinleighsmith <[email protected]>
Co-authored-by: devinleighsmith <[email protected]>
Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: Manuel Rodriguez <[email protected]>
Co-authored-by: Manuel Rodriguez <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Eduardo <[email protected]>
Co-authored-by: Herrera <[email protected]>
Co-authored-by: Doug Filteau <[email protected]>
Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: Smith <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants