-
Notifications
You must be signed in to change notification settings - Fork 38
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
[MDS-6029] Tools for reviewing amalgamated permit amendments #3396
[MDS-6029] Tools for reviewing amalgamated permit amendments #3396
Conversation
services/core-web/src/components/mine/Permit/PermitConditions.tsx
Outdated
Show resolved
Hide resolved
services/core-api/app/api/mines/permits/permit_extraction/create_permit_conditions.py
Show resolved
Hide resolved
dd17492
to
73b1739
Compare
services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks awesome. Liking the use of the new AppSelector and the few sneaky improvements in here!
services/core-api/app/api/mines/permits/permit_conditions/services/permit_condition_comparer.py
Show resolved
Hide resolved
services/core-api/app/api/mines/permits/permit_amendment/resources/permit_amendment_diff.py
Outdated
Show resolved
Hide resolved
services/core-api/app/api/search/search/permit_search_service.py
Outdated
Show resolved
Hide resolved
services/core-web/src/components/mine/Permit/ComparePermitConditionHistoryModal.tsx
Outdated
Show resolved
Hide resolved
services/core-web/src/components/mine/Permit/PermitConditionForm.spec.tsx
Show resolved
Hide resolved
services/core-web/src/components/mine/Permit/PermitConditions.spec.tsx
Outdated
Show resolved
Hide resolved
9f527e3
to
bfaedb9
Compare
3608278
to
da2f7c6
Compare
|
|
|
|
Objective
MDS-6029
Added some tools to better handle permit amendments in the permit extraction flow.
History Modal
![image](https://private-user-images.githubusercontent.com/66635118/408309242-32d926c5-23ff-404a-bfb7-7a1249db8bd4.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5Mjc5MzIsIm5iZiI6MTczODkyNzYzMiwicGF0aCI6Ii82NjYzNTExOC80MDgzMDkyNDItMzJkOTI2YzUtMjNmZi00MDRhLWJmYjctN2ExMjQ5ZGI4YmQ0LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA3VDExMjcxMlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTE0NDIzNTYzMDM2ZGE3ZDI2MmJjNDM3NTY0MWQ5M2ZjODYwY2MzYTJhOTBhZGI4NDcxODlkYjJlODRhYjM4MmImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.gw403Yr1eEW2xguHWTS8hptW7NFWSIDXZnq18Fdk-Lo)
![image](https://private-user-images.githubusercontent.com/66635118/408333143-1344a96b-628f-482a-8a91-28b523e46163.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5Mjc5MzIsIm5iZiI6MTczODkyNzYzMiwicGF0aCI6Ii82NjYzNTExOC80MDgzMzMxNDMtMTM0NGE5NmItNjI4Zi00ODJhLThhOTEtMjhiNTIzZTQ2MTYzLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA3VDExMjcxMlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTM5YjU5NmExZDJhNWEyNDJlNmMwMjczMmVkMTdjNmVkOWMxNzczNDg2MGVkMDljOTYxYmE4ZDRjN2VkYWJkMTcmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.ttNwZei74GYqOl65Ok1UJWIxqiYvPfeLwypCzD_AoBE)
Added a side by side view to view a diff between the current condition and what it was in the previous amendment following these rules:
This is calculated on demand when opening the history to capture any changes you've made.
Auto Approval
Modified permit condition create to auto-approve any top level conditions where the condition itself and any of the children all 100% match a section in the previous amendment when it comes to text and structure
Report Copying
If a textual match (> 80%) in the previous amendment, we copy the report requirement from the matching condition
Flow
An update was made so the Permit Conditions tab now by default shows the latest amendment that was reviewed. This is what a lot of the small changes regarding currentAmendment, and latestAmendment are about.
latestAmendment
: The latest amendment of the permit (regardless of the approval status)currentAmendment
: The amendment you're currently viewing conditions for. This will always match the newpermitAmendmentGuid
in the url params.