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

PWNN-2090 Store FaF data in the CMS register as 'DfE approved' frameworks(FaF Tool) #1989

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

edwin-jebaraj
Copy link
Collaborator

Changes in this PR

Story
PWNN-2090
PWNN-2092
PWNN-2095
PWNN-2096

app/components/activity_log/history_item_component.rb - Added new label for faf tool import activity
app/controllers/frameworks/frameworks_controller.rb - Added sort by option to the Provider and Provider contact
app/models/frameworks/framework.rb - Added validation
app/models/frameworks/framework/sortable.rb - Removed unwanted sortable field
app/models/frameworks/framework/sourceable.rb - Added new Source enum value for faf data import
app/models/frameworks/framework/status_changeable.rb - Updated status order and added new status value
app/services/frameworks/sync_frameworks.rb - Added framework import functionality
app/views/frameworks/frameworks/_form.html.erb - Removed unwanted fields and added condition for FaF data non editable
app/views/frameworks/frameworks/_framework.html.erb - Removed unwanted fields on Framework listing
app/views/frameworks/frameworks/_index_filters.html.erb - Removed unwanted fields on framework filter
app/views/frameworks/frameworks/_status.html.erb - Added new status colour
config/locales/validation/en.yml - Added new validation language variable
db/migrate/20241023161813_add_extra_fields_to_frameworks_frameworks.rb - Added extra fields to frameworks_frameworks table to import FaF data
db/schema.rb - updated db migration

Screen-shots or screen-capture of UI changes

Copy link
Collaborator

@threedaymonk threedaymonk left a comment

Choose a reason for hiding this comment

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

Please also tidy up your branch history as in the guidelines

app/models/frameworks/framework/status_changeable.rb Outdated Show resolved Hide resolved
app/services/support/sync_frameworks.rb Outdated Show resolved Hide resolved
db/schema.rb Outdated Show resolved Hide resolved
spec/services/support/sync_frameworks_spec.rb Outdated Show resolved Hide resolved
app/models/frameworks/framework/filtering.rb Outdated Show resolved Hide resolved
app/views/frameworks/frameworks/_form.html.erb Outdated Show resolved Hide resolved
Copy link

Test coverage

Line: 87.31%
Branch: 77.42%

Copy link

Test coverage

Line: 87.31%
Branch: 77.37%

Copy link

Test coverage

Line: 87.14%
Branch: 77.27%

Copy link

Test coverage

Line: 87.23%
Branch: 77.26%

Copy link

Test coverage

Line: 87.07%
Branch: 77.17%

1 similar comment
Copy link

Test coverage

Line: 87.07%
Branch: 77.17%

Copy link

Test coverage

Line: 87.23%
Branch: 77.22%

Copy link

sonarcloud bot commented Nov 22, 2024

Copy link

Test coverage

Line: 87.23%
Branch: 77.22%

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.

2 participants