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.

Sign up for GitHub

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

fix: AutompleteSelect when options is already filled and analytics StackedBarsNormalized with selected implementation groups #1493

Merged
merged 3 commits into from
Feb 11, 2025
Merged

fix: AutompleteSelect when options is already filled and analytics StackedBarsNormalized with selected implementation groups #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e54d5b
fix: AutompleteSelect when options is already filled
Mohamed-Hacene Feb 11, 2025
f56e64d
chore: format
Mohamed-Hacene Feb 11, 2025
16e404a
fix: selected implementation groups in analytics summary StackedBarsN…
Mohamed-Hacene Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions backend/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2958,16 +2958,31 @@ def get_requirements_status_count(self):

def get_requirements_result_count(self):
requirements_result_count = []
for rs in RequirementAssessment.Result:
requirements_result_count.append(
(
RequirementAssessment.objects.filter(result=rs)
.filter(compliance_assessment=self)
.filter(requirement__assessable=True)
.count(),
rs,
)
)
selected_implementation_groups_set = (
set(self.selected_implementation_groups)
if self.selected_implementation_groups
else None
)

requirements = RequirementAssessment.objects.filter(
compliance_assessment=self, requirement__assessable=True
).select_related("requirement")

if selected_implementation_groups_set is not None:
result_groups = {}
for req in requirements:
req_groups = set(req.requirement.implementation_groups or [])
if selected_implementation_groups_set & req_groups:
result_groups.setdefault(req.result, []).append(req)

for rs in RequirementAssessment.Result:
count = len(result_groups.get(rs, []))
requirements_result_count.append((count, rs))
else:
for rs in RequirementAssessment.Result:
count = requirements.filter(result=rs).count()
requirements_result_count.append((count, rs))

return requirements_result_count

def get_measures_status_count(self):
Expand Down
24 changes: 11 additions & 13 deletions frontend/src/lib/components/Forms/AutocompleteSelect.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
let selected: (typeof options)[] = [];
let selectedValues: (string | undefined)[] = [];
let isInternalUpdate = false;
let optionsLoaded = false;
let optionsLoaded = Boolean(options.length);
let initialValue = $value; // Store initial value
const default_value = nullable ? null : selectedValues[0];

Expand Down Expand Up @@ -141,21 +141,19 @@
if (updateMissingConstraint) {
updateMissingConstraint(field, isMissing);
}

// After options are loaded, set initial selection using stored initial value
if (initialValue) {
selected = options.filter((item) =>
Array.isArray(initialValue)
? initialValue.includes(item.value)
: item.value === initialValue
);
} else if (options.length === 1 && $constraints?.required) {
selected = [options[0]];
}

optionsLoaded = true;
}
}
// After options are loaded, set initial selection using stored initial value
if (initialValue) {
selected = options.filter((item) =>
Array.isArray(initialValue)
? initialValue.includes(item.value)
: item.value === initialValue
);
} else if (options.length === 1 && $constraints?.required) {
selected = [options[0]];
}
} catch (error) {
console.error(`Error fetching ${optionsEndpoint}:`, error);
} finally {
Expand Down
Loading