BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed displaying statuses in the filter for tables;

Browse Source 
- added redirect to dashboard upon changing current company;
This commit is contained in:
Vitalii Kiiko
2025-02-17 16:03:03 +01:00
parent 810ffd2a81
commit 4773eff552
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/TopBarProfileMenu/index.js
View File

@@ -95,6 +95,8 @@ const TopBarProfileMenu = ({ menuLeftRef }) => {
detail: __('L\'azienda è stata cambiata') detail: __('L\'azienda è stata cambiata')
}); });
} }
navigate('/')
} }
} }

3
src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js
View File

@@ -102,7 +102,8 @@ const InstructorManagerMieDomandeTable = ({ userId = null, statuses = [] }) => {
evaluationEndDate: { evaluationEndDate: {
operator: FilterOperator.AND, operator: FilterOperator.AND,
constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
} },
status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }
}); });
}; };

3
src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
View File

@@ -102,7 +102,8 @@ const PreInstructorDomandeTable = ({ userId = null, statuses = [] }) => {
evaluationEndDate: { evaluationEndDate: {
operator: FilterOperator.AND, operator: FilterOperator.AND,
constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
} },
status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }
}); });
}; };

6
src/pages/Domande/components/AllDomandeTable/index.js
View File

@@ -177,8 +177,10 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
filter sortable filter sortable
filterPlaceholder={__('Cerca il nome', 'gepafin')} filterPlaceholder={__('Cerca il nome', 'gepafin')}
style={{ minWidth: '8rem' }}/> style={{ minWidth: '8rem' }}/>
<Column field="status" header={__('Stato', 'gepafin')} <Column field="status"
style={{ minWidth: '8rem' }} body={statusBodyTemplate} header={__('Stato', 'gepafin')}
style={{ minWidth: '8rem' }}
body={statusBodyTemplate}
filter filter
filterElement={statusFilterTemplate}/> filterElement={statusFilterTemplate}/>
<Column header={__('Azioni', 'gepafin')} <Column header={__('Azioni', 'gepafin')}

11
src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
View File

@@ -94,8 +94,8 @@ const PreInstructorSoccorsiTable = ({ userId = null }) => {
evaluationEndDate: { evaluationEndDate: {
operator: FilterOperator.AND, operator: FilterOperator.AND,
constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
} },
}); status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }, });
}; };
const renderHeader = () => { const renderHeader = () => {
@@ -165,8 +165,11 @@ const PreInstructorSoccorsiTable = ({ userId = null }) => {
filterField="evaluationEndDate" dataType="date" filterField="evaluationEndDate" dataType="date"
style={{ minWidth: '8rem' }} style={{ minWidth: '8rem' }}
body={dateExpirationBodyTemplate} filter filterElement={dateFilterTemplate}/> body={dateExpirationBodyTemplate} filter filterElement={dateFilterTemplate}/>
<Column field="status" header={__('Stato', 'gepafin')} <Column field="status"
style={{ minWidth: '7rem' }} body={statusBodyTemplate} filter header={__('Stato', 'gepafin')}
style={{ minWidth: '7rem' }}
body={statusBodyTemplate}
filter
filterElement={statusFilterTemplate} /> filterElement={statusFilterTemplate} />
<Column header={__('Azioni', 'gepafin')} <Column header={__('Azioni', 'gepafin')}
body={actionsBodyTemplate}/> body={actionsBodyTemplate}/>