Feat: Merge January Candidate - 240117 #2807
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…26.18 Bump urllib3 from 1.26.12 to 1.26.18 in /backend
Improve the error message shown when a user tries to propose a credit transfer with an empty Agreement Date field. Previous message: 'Error! Date has wrong format. Use one of these formats instead: YYYY-MM-DD.' New message: 'Error! Please enter a valid date in the Agreement Date field: YYYY-MM-DD.'
Reduce the width of the 'Effective Date' column and widen the 'Comments' column in Excel export for better data readability. Due to the previously added 'Category' column, adjust the numbers of all columns after column 7 by increasing them by one. (Column numbers start from 0)
…-sheet-column-width-2684 fix: adjust column widths in xls transactions sheet
…rr-msg-2469 fix: adjust credit transfer agreement date error message (#2469)
…option-2553 fix: removed 2023 option from compliance report dropdown
This commit reverts unintended label changes on the 'Edit Organization' page to their original state, ensuring UI consistency for IDIR users. Closes #2704
…-changes-2704 fix: revert org status label changes on edit organization page
Bumps [django](https://github.com/django/django) from 3.2.20 to 3.2.23. - [Commits](django/django@3.2.20...3.2.23) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…option-2553 Fix/kevin remove 2023 compliance option 2553
Bump django from 3.2.20 to 3.2.23 in /backend
Compliance Report Model changes to include latest_report and root_report information To migrate the data to these new columns Using select_related and prefetch_related wherever necessary Making use of the new columns in data retrieval
Since cache wasn't showing the updated details. have removed it for now.
- Added cache for Compliance Report & Organizations - changes to ComplianceReport Query to retrieve latest reports
…rical-2773 feat: TFRS - Adjust 'Part 3 Award' label for transaction type in the Historical Data Entry feature #2773
…bel-issue-2772 Fix: Fix incorrect labels in initiative agreement issuance transaction - 2772
…date-2774 Fix: Update labels in notifications settings as per new act - 2774
…-2785 Fix: Update user guide links - 2785
…-confirmation-2789 Fix: Correct labels transfer confirmation - 2789
…x-2769 FIX: HDE Transactions effective date fix in spreadsheet 2769
fix: fixes on label and compliance years
…of-transfer-2095-2768 Fix: Correct effective date of transfer 2095 - 2768
…-2773 fix part 3 label in the historical data entry table - 2773
…date-2774 Fix: Update two notifications labels - 2774
…-confirmation-2789 Fix: Update Modal ConfirmLabel Logic for Transaction Types - 2789
|
@AlexZorkin The frontend/package.json should keep version as 2.14.0.
the import-data.sh may be need to be revised after the merge |
|
There is a 0014_update_trade_effective_dates.py on release-2.14.0 already. It may have conflicts when run migrations. |
added 2 commits
January 22, 2024 10:37
thanks, i fixed the ordering now. |
kuanfandevops
added a commit
that referenced
this pull request
Jan 31, 2024
* update for 2.14.0 * update pr number for 2.14.0 * fix: fix ui category display mismatch for approved transfers. * fix: update the ui tests for the CreditTransferSigningHistory component * crunchy related update in pipeline * fix: attorny address if null/empty * fix: updated trade effective date to be set upon approval * chore: Update functions.js, remove unneeded comments * Bump jinja2 from 3.1.2 to 3.1.3 in /backend Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](pallets/jinja@3.1.2...3.1.3) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Fix: Effective Date fix for HDE entries-2769 * Feat: Merge January Candidate - 240117 (#2807) This merge represents a significant effort to align the TFRS application with the latest legislative requirements, improve the user experience, and enhance the overall reliability and functionality of the system. Here is a high-level summary: 1. **User Interface and Experience Improvements:** - Enhanced error messages for credit transfer agreement dates and other functionalities to improve clarity and user guidance. - Adjustments in the UI, particularly in the Excel export feature and the 'Edit Organization' page, for better data readability and consistency. 2. **Legislative Compliance Updates:** - Removal of outdated options (e.g., the year 2023) from various dropdown menus to align with current legislation. - Introduction of compliance unit concepts in compliance reports, replacing previous credits and debits systems. - Adjustments to the compliance report model and related queries to improve loading times and data management. - Various bug fixes and updates related to compliance report generation and submission, including handling negative balances and reserve compliance units. 3. **System Enhancements and Bug Fixes:** - Removal of redundant caching logic to ensure updated details are displayed. - Significant backend updates, including Django version bump from 3.2.20 to 3.2.23. - Addition of new features like the maxCredits service method and more flexible filtering for organization status. - A multitude of bug fixes, including UI corrections, compliance unit calculations, and test case enhancements. 4. **Development and Deployment Process Improvements:** - Implementation of new pipelines and build processes for both frontend and backend, enhancing the deployment workflow. - Addition of unit tests and continuous integration steps to ensure code stability and reliability. 5. **Label and Terminology Updates:** - Comprehensive updates to labels and terminology across various views and functionalities, aligning with the new act. - Specific focus on compliance reports, transaction types, and dashboard displays to ensure clarity and legislative compliance. 6. **Database and Data Handling Enhancements:** - Database migrations to support new features and legislative changes. - Optimization of code and data handling processes, including compliance report spreadsheet updates and handling of different scenarios in compliance unit calculations. * add backendKeycloakCertsUrl * fix: fix incorrect button label in draft initiative agreement issuance (#2811) * fix: fix unresponsive filter input in id column for transactions table (#2815) * Fix: TFRS - Compliance summary rounding discrepancy in supplemental reporting #2817 (#2819) * fix: update act citations in transaction history (#2820) * Fix: TFRS - Date/time stamp records twice in report history box when hitting "recommend for acceptance" #2814 (#2818) * Fix: Date/time stamp records twice in report history box when hitting "recommend for acceptance" #2814 * fix: minor fix * Fix: TFRS - Issues with the effective date for transactions entered using the Historical Data Entry feature #2821 (#2822) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Hamed Valiollahi Bayeki <[email protected]> Co-authored-by: Alex Zorkin <[email protected]> Co-authored-by: Kevin Hashimoto <[email protected]> Co-authored-by: Your Name <[email protected]> Co-authored-by: kevin-hashimoto <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Prashanth Venkateshappa <[email protected]> Co-authored-by: Prashanth <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.