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

- updated sviluppumbria logo;

Browse Source 
- updated templates for pre instructor;
This commit is contained in:
Vitalii Kiiko
2024-10-25 14:50:05 +02:00
parent f0036f9596
commit 05918f2ae8
11 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/scss/components/layout.scss
View File

@@ -35,7 +35,7 @@ img {
}
.appLogo {
height: 50px;
height: 150px;
}
.inner {

7
src/assets/scss/components/misc.scss
View File

@@ -113,16 +113,15 @@
background-color: rgba(255,255,255,0.3)
}
.p-inputgroup {
align-items: center;
}
.p-accordion-header-text, .p-accordion-content {
p {
margin: 0;
}
}
.p-inputgroup.flex-1 {
align-items: center;
}
.flex-1 {
display: flex;
align-items: center;

6
src/assets/scss/components/topBar.scss
View File

@@ -1,5 +1,9 @@
.topBar {
background: var(--horizontalMenu-background)
padding: 0.5rem 1rem;
background: var(--horizontalMenu-background);
}
.topBar .appLogo {
height: 70px;
}
.topBar__endContent {
display: flex;

2
src/layouts/DefaultLayout/components/AppSidebar/index.js
View File

@@ -50,7 +50,7 @@ const AppSidebar = () => {
{
label: __('Domande da valutare', 'gepafin'),
icon: 'pi pi-calendar-clock',
href: '/valutazioni',
href: '/domande',
id: 6,
enable: intersection(permissions, ['EVALUATE_APPLICATIONS']).length
},

19
src/pages/BandoApplication/index.js
View File

@@ -627,15 +627,16 @@ const BandoApplication = () => {
</div>
: null}
<div className="appPageSection">
<Button
type="button"
disabled={'READY' !== applicationStatus}
onClick={onSubmit}
label={__('Invia', 'gepafin')}
icon="pi pi-download"
iconPos="right"/>
</div>
{'DRAFT' !== applicationStatus
? <div className="appPageSection">
<Button
type="button"
disabled={'READY' !== applicationStatus}
onClick={onSubmit}
label={__('Invia', 'gepafin')}
icon="pi pi-check"
iconPos="right"/>
</div> : null}
<div className="appPage__spacer"></div>

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

@@ -1,12 +1,13 @@
import React, { useState, useEffect} from 'react';
import { __ } from '@wordpress/i18n';
import { is, uniq } from 'ramda';
import { Link } from 'react-router-dom';
// store
//import { storeSet, storeGet } from '../../../../store';
import { useStore } from '../../../../store';
// api
//import ApplicationService from '../../../../service/application-service';
import AssignedApplicationService from '../../../../service/assigned-application-service';
// components
import { FilterMatchMode, FilterOperator } from 'primereact/api';
@@ -18,8 +19,6 @@ import { InputIcon } from 'primereact/inputicon';
import { Button } from 'primereact/button';
import { Calendar } from 'primereact/calendar';
import ProperBandoLabel from '../../../../components/ProperBandoLabel';
import AssignedApplicationService from '../../../../service/assigned-application-service';
import { useStore } from '../../../../store';
const PreInstructorDomandeTable = () => {
@@ -128,10 +127,13 @@ const PreInstructorDomandeTable = () => {
};
const actionsBodyTemplate = (rowData) => {
return <Button severity="info"
/*return <Button severity="info"
onClick={() => createEvaluation(rowData.id)}
label={__('Valuta', 'gepafin')}
icon="pi pi-pencil" size="small" iconPos="right" />
icon="pi pi-pencil" size="small" iconPos="right" />*/
return <Link to={`/domande/${rowData.id}`}>
<Button severity="info" label={__('Valuta', 'gepafin')} icon="pi pi-eye" size="small" iconPos="right"/>
</Link>
}
const header = renderHeader();

2
src/pages/DashboardPreInstructor/index.js
View File

@@ -20,7 +20,7 @@ const DashboardPreInstructor = () => {
//const [mainStats, setMainStats] = useState({});
const goToAllEvaluations = () => {
navigate('/valutazioni');
navigate('/domande');
}
return(

12
src/pages/Users/components/AllUsersTable/index.js
View File

@@ -135,12 +135,12 @@ const AllUsersTable = () => {
return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)}/>;
};
const actionsBodyTemplate = (rowData) => {
/*return <Link to={`/utenti/${rowData.id}`}>
/*const actionsBodyTemplate = (rowData) => {
/!*return <Link to={`/utenti/${rowData.id}`}>
<Button severity="info" label={__('Modifica', 'gepafin')} icon="pi pi-pencil" size="small" iconPos="right"/>
</Link>*/
</Link>*!/
return null;
}
}*/
const header = renderHeader();
@@ -169,8 +169,8 @@ const AllUsersTable = () => {
filterField="lastLogin" dataType="date"
style={{ minWidth: '10rem' }}
body={dateLastAccessBodyTemplate} filter filterElement={dateFilterTemplate}/>
<Column header={__('Azioni', 'gepafin')}
body={actionsBodyTemplate}/>
{/*<Column header={__('Azioni', 'gepafin')}
body={actionsBodyTemplate}/>*/}
</DataTable>
</div>
)

17
src/routes.js
View File

@@ -84,7 +84,12 @@ const routes = ({ role, chosenCompanyId }) => {
<Route path="/domande" element={<DefaultLayout>
{'ROLE_SUPER_ADMIN' === role ? <Domande/> : null}
{'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
{'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
{'ROLE_PRE_INSTRUCTOR' === role ? <Evaluations/> : null}
</DefaultLayout>}/>
<Route path="/domande/:id/" element={<DefaultLayout>
{'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
{'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
{'ROLE_PRE_INSTRUCTOR' === role ? <EvaluationEdit/> : null}
</DefaultLayout>}/>
<Route path="/imieibandi" element={<DefaultLayout>
{'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
@@ -96,16 +101,6 @@ const routes = ({ role, chosenCompanyId }) => {
{'ROLE_BENEFICIARY' === role ? <BandoApplication/> : null}
{'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
</DefaultLayout>}/>
<Route path="/valutazioni" element={<DefaultLayout>
{'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
{'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
{'ROLE_PRE_INSTRUCTOR' === role ? <Evaluations/> : null}
</DefaultLayout>}/>
<Route path="/valutazioni/:id/" element={<DefaultLayout>
{'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
{'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
{'ROLE_PRE_INSTRUCTOR' === role ? <EvaluationEdit/> : null}
</DefaultLayout>}/>
<Route path="/profilo" element={<DefaultLayout>
{'ROLE_SUPER_ADMIN' === role ? <Profile/> : null}
{'ROLE_BENEFICIARY' === role ? <ProfileBeneficiario/> : null}