rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-26 20:54:21 +01:00
Code Issues Releases Activity

(bug) plan's categories descriptions are not shown

Browse Source 
Also fixes a bug about empty groups displayed in the subscription page
This commit is contained in:
Sylvain 2022-09-26 11:31:45 +02:00
parent 9856450aac
commit 929c70b5be
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,6 +1,8 @@
# Changelog Fab-manager
- Fix a bug: unable to show the daily view of the public agenda, if it contains trainings or events
- Fix a bug: plan's categories descriptions are not shown
- Fix a bug: groups without plans are shown but empty
## v5.4.19 2022 September 13
- Fix a bug: computing the wallet amount to debit ignores the applied coupon

13
app/frontend/src/javascript/components/plans/plans-list.tsx
View File

@ -117,10 +117,10 @@ export const PlansList: React.FC<PlansListProps> = ({ onError, onPlanSelection,
};
/**
* When called with a category ID, returns the name of the requested plan-category
* When called with a category ID, returns the requested plan-category
*/
const categoryName = (categoryId: number): string => {
return planCategories.find(c => c.id === categoryId)?.name;
const findCategory = (categoryId: number): PlanCategory => {
return planCategories.find(c => c.id === categoryId);
};
/**
@ -193,10 +193,13 @@ export const PlansList: React.FC<PlansListProps> = ({ onError, onPlanSelection,
return (
<div className="list-of-categories">
{Array.from(plans).sort(compareCategories).map(([categoryId, plansByCategory]) => {
const category = findCategory(categoryId);
const categoryPlans = plansByCategory.filter(filterPlan);
const isShown = !!categoryId && categoryPlans.length > 0;
return (
<div key={categoryId} className={`plans-per-category ${categoryId ? 'with-category' : 'no-category'}`}>
{!!categoryId && categoryPlans.length > 0 && <h3 className="category-title">{ categoryName(categoryId) }</h3>}
{isShown && <h3 className="category-title">{ category.name }</h3>}
{isShown && <p className="category-description" dangerouslySetInnerHTML={{ __html: category.description }} />}
{renderPlans(categoryPlans)}
</div>
);
@ -232,7 +235,7 @@ export const PlansList: React.FC<PlansListProps> = ({ onError, onPlanSelection,
{plans && Array.from(filteredPlans()).map(([groupId, plansByGroup]) => {
return (
<div key={groupId} className="plans-per-group">
<h2 className="group-title">{ groupName(groupId) }</h2>
{plansByGroup.size > 0 && <h2 className="group-title">{ groupName(groupId) }</h2>}
{plansByGroup && renderPlansByCategory(plansByGroup)}
</div>
);