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

Merge branch 'develop'

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-03-25 12:34:28 +01:00
parent 636885173b a95750689b
commit 8c591ace7c
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages/Dashboard/index.js
View File

@@ -11,9 +11,12 @@ import DashboardService from '../../service/dashboard-service';
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
import ChartDomandePerBando from '../../components/ChartDomandePerBando'; import ChartDomandePerBando from '../../components/ChartDomandePerBando';
import ChartStatoDomande from '../../components/ChartStatoDomande'; import ChartStatoDomande from '../../components/ChartStatoDomande';
import LatestBandiTableAsync from './components/LatestBandiTableAsync'; /*import LatestBandiTableAsync from './components/LatestBandiTableAsync';
import AllDomandeTableAsync from '../Domande/components/AllDomandeTableAsync'; import AllDomandeTableAsync from '../Domande/components/AllDomandeTableAsync';
import DraftApplicationsTableAsync from './components/DraftApplicationsTableAsync'; import DraftApplicationsTableAsync from './components/DraftApplicationsTableAsync';*/
import LatestBandiTable from './components/LatestBandiTable';
import DraftApplicationsTable from './components/DraftApplicationsTable';
import AllDomandeTable from '../Domande/components/AllDomandeTable';
const REACT_APP_HUB_ID = process.env.REACT_APP_HUB_ID; const REACT_APP_HUB_ID = process.env.REACT_APP_HUB_ID;
@@ -139,21 +142,24 @@ const Dashboard = () => {
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Ultimi bandi pubblicati', 'gepafin')}</h2> <h2>{__('Ultimi bandi pubblicati', 'gepafin')}</h2>
<LatestBandiTableAsync/> {/*<LatestBandiTableAsync/>*/}
<LatestBandiTable/>
</div> </div>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Ultime domande pubblicate', 'gepafin')}</h2> <h2>{__('Ultime domande pubblicate', 'gepafin')}</h2>
<AllDomandeTableAsync/> {/*<AllDomandeTableAsync/>*/}
<AllDomandeTable/>
</div> </div>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Domande in bozza', 'gepafin')}</h2> <h2>{__('Domande in bozza', 'gepafin')}</h2>
<DraftApplicationsTableAsync/> {/*<DraftApplicationsTableAsync/>*/}
<DraftApplicationsTable/>
</div> </div>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>

16
src/pages/DashboardInstructorManager/index.js
View File

@@ -11,9 +11,12 @@ import DashboardService from '../../service/dashboard-service';
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
import ChartDomandePerBando from '../../components/ChartDomandePerBando'; import ChartDomandePerBando from '../../components/ChartDomandePerBando';
import ChartStatoDomande from '../../components/ChartStatoDomande'; import ChartStatoDomande from '../../components/ChartStatoDomande';
import LatestBandiTableInstructorManagerAsync from './components/LatestBandiTableInstructorManagerAsync'; /*import LatestBandiTableInstructorManagerAsync from './components/LatestBandiTableInstructorManagerAsync';
import DraftApplicationsTableAsync from '../Dashboard/components/DraftApplicationsTableAsync'; import DraftApplicationsTableAsync from '../Dashboard/components/DraftApplicationsTableAsync';
import AllDomandeTableAsync from '../Domande/components/AllDomandeTableAsync'; import AllDomandeTableAsync from '../Domande/components/AllDomandeTableAsync';*/
import LatestBandiTableInstructorManager from './components/LatestBandiTableInstructorManager';
import AllDomandeTable from '../Domande/components/AllDomandeTable';
import DraftApplicationsTable from '../Dashboard/components/DraftApplicationsTable';
const DashboardInstructorManager = () => { const DashboardInstructorManager = () => {
const navigate = useNavigate(); const navigate = useNavigate();
@@ -109,21 +112,24 @@ const DashboardInstructorManager = () => {
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Ultimi bandi pubblicati', 'gepafin')}</h2> <h2>{__('Ultimi bandi pubblicati', 'gepafin')}</h2>
<LatestBandiTableInstructorManagerAsync/> {/*<LatestBandiTableInstructorManagerAsync/>*/}
<LatestBandiTableInstructorManager/>
</div> </div>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Ultime domande pubblicate', 'gepafin')}</h2> <h2>{__('Ultime domande pubblicate', 'gepafin')}</h2>
<AllDomandeTableAsync/> {/*<AllDomandeTableAsync/>*/}
<AllDomandeTable/>
</div> </div>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Domande in bozza', 'gepafin')}</h2> <h2>{__('Domande in bozza', 'gepafin')}</h2>
<DraftApplicationsTableAsync/> {/*<DraftApplicationsTableAsync/>*/}
<DraftApplicationsTable/>
</div> </div>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>

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

@@ -12,7 +12,8 @@ import DashboardService from '../../service/dashboard-service';
// components // components
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
import DomandeTablePreInstructorAsync from './components/DomandeTablePreInstructorAsync'; //import DomandeTablePreInstructorAsync from './components/DomandeTablePreInstructorAsync';
import PreInstructorDomandeTable from './components/PreInstructorDomandeTable';
const DashboardPreInstructor = () => { const DashboardPreInstructor = () => {
const navigate = useNavigate(); const navigate = useNavigate();
@@ -110,8 +111,8 @@ const DashboardPreInstructor = () => {
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Coda di lavoro', 'gepafin')}</h2> <h2>{__('Coda di lavoro', 'gepafin')}</h2>
{/*<PreInstructorDomandeTable statuses={['OPEN', 'SOCCORSO']} userId={userData.id}/>*/} <PreInstructorDomandeTable statuses={['OPEN', 'SOCCORSO']} userId={userData.id}/>
<DomandeTablePreInstructorAsync statuses={['OPEN', 'SOCCORSO']} userId={userData.id}/> {/*<DomandeTablePreInstructorAsync statuses={['OPEN', 'SOCCORSO']} userId={userData.id}/>*/}
</div> </div>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>