From 7803816e219784a5b806190d6858123bb00426d3 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Fri, 15 Nov 2024 16:07:03 +0100 Subject: [PATCH] - added message for beneficiary about requirement of adding company; --- src/assets/scss/components/appPage.scss | 4 +++ src/assets/scss/components/layout.scss | 8 +++++ .../components/AllBandiAccordion/index.js | 7 +++-- src/pages/BandiBeneficiario/index.js | 21 +++++++++++-- .../components/LatestBandiTable/index.js | 10 ++++--- src/pages/DashboardBeneficiario/index.js | 30 ++++++++++++++----- 6 files changed, 63 insertions(+), 17 deletions(-) diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index c280975..54a8fba 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -276,6 +276,10 @@ .summary { font-weight: bold; } + + a { + color: inherit; + } } @container section_with_border (max-width: 600px) { diff --git a/src/assets/scss/components/layout.scss b/src/assets/scss/components/layout.scss index 7c6eb60..e226e1a 100644 --- a/src/assets/scss/components/layout.scss +++ b/src/assets/scss/components/layout.scss @@ -28,6 +28,14 @@ body { } } +a { + color: inherit; + + &:hover { + text-decoration: none; + } +} + #root, .wrapper { min-height: 100%; display: flex; diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js index 8d167f8..a4cdef6 100644 --- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js +++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js @@ -1,6 +1,6 @@ import React, { useState, useEffect} from 'react'; import { __ } from '@wordpress/i18n'; -import { is, uniq, isNil } from 'ramda'; +import { is, uniq, isNil, isEmpty } from 'ramda'; import { wrap } from 'object-path-immutable'; // store @@ -28,6 +28,7 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse const AllBandiAccordion = () => { + const chosenCompanyId = useStore().main.chosenCompanyId(); const isAsyncRequest = useStore().main.isAsyncRequest(); const [items, setItems] = useState(null); const [filters, setFilters] = useState(null); @@ -113,11 +114,11 @@ const AllBandiAccordion = () => {
{renderHtmlContent(data.descriptionShort)}

{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}

- {!data.confidi + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && !data.confidi ? : null} - {data.confidi + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi ? : null} diff --git a/src/pages/BandiBeneficiario/index.js b/src/pages/BandiBeneficiario/index.js index 66942d3..ba0571d 100644 --- a/src/pages/BandiBeneficiario/index.js +++ b/src/pages/BandiBeneficiario/index.js @@ -1,13 +1,17 @@ import React from 'react'; import { __ } from '@wordpress/i18n'; -import { useNavigate } from 'react-router-dom'; +import { Link, useNavigate } from 'react-router-dom'; // components import AllBandiAccordion from './components/AllBandiAccordion'; import { Button } from 'primereact/button'; +import { isEmpty } from 'ramda'; +import { useStore } from '../../store'; const BandiBeneficiario = () => { - return( + const chosenCompanyId = useStore().main.chosenCompanyId(); + + return (

{__('Bandi disponibili', 'gepafin')}

@@ -15,6 +19,19 @@ const BandiBeneficiario = () => {
+ {isEmpty(chosenCompanyId) || chosenCompanyId === 0 + ? <> +
+ + {__('Attenzione', 'gepafin')} + + {__('Per applicare ai bandi devi Registare un Azienda clicca', 'gepafin')} + {__('qua', 'gepafin')} + +
+
+ : null} +
diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js index 5e381d9..61bb789 100644 --- a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js +++ b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js @@ -1,10 +1,10 @@ import React, { useState, useEffect } from 'react'; import { __ } from '@wordpress/i18n'; -import { uniq } from 'ramda'; +import { uniq, isEmpty } from 'ramda'; import { Link } from 'react-router-dom'; // store -import { storeSet } from '../../../../store'; +import { storeSet, useStore } from '../../../../store'; // api import BandoService from '../../../../service/bando-service'; @@ -22,6 +22,7 @@ import ProperBandoLabel from '../../../../components/ProperBandoLabel'; const LatestBandiTable = () => { + const chosenCompanyId = useStore().main.chosenCompanyId(); const [items, setItems] = useState(null); const [filters, setFilters] = useState(null); const [loading, setLoading] = useState(false); @@ -145,8 +146,9 @@ const LatestBandiTable = () => { body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/> - + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 + ? : null}
) diff --git a/src/pages/DashboardBeneficiario/index.js b/src/pages/DashboardBeneficiario/index.js index 4500f0c..6503111 100644 --- a/src/pages/DashboardBeneficiario/index.js +++ b/src/pages/DashboardBeneficiario/index.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; -import { __ } from '@wordpress/i18n'; -import { useNavigate } from 'react-router-dom'; -import { head, pathOr } from 'ramda'; +import { __, sprintf } from '@wordpress/i18n'; +import { Link, useNavigate } from 'react-router-dom'; +import { head, isEmpty, pathOr } from 'ramda'; import NumberFlow from '@number-flow/react'; // store @@ -35,7 +35,8 @@ const DashboardBeneficiario = () => { } } - const errGetStats = () => {} + const errGetStats = () => { + } useEffect(() => { const existingCompany = head(companies.filter(o => o.id === chosenCompanyId)); @@ -45,7 +46,7 @@ const DashboardBeneficiario = () => { } }, [companies, chosenCompanyId]); - return( + return (

{__('Dashboard', 'gepafin')}

@@ -61,21 +62,21 @@ const DashboardBeneficiario = () => { + locales="it-IT"/>
{__('Bandi osservati', 'gepafin')} + locales="it-IT"/>
{__('Documenti da integrare', 'gepafin')} + locales="it-IT"/>
@@ -89,6 +90,19 @@ const DashboardBeneficiario = () => {
+ {isEmpty(chosenCompanyId) || chosenCompanyId === 0 + ? <> +
+ + {__('Attenzione', 'gepafin')} + + {__('Per applicare ai bandi devi Registare un Azienda clicca', 'gepafin')} + {__('qua', 'gepafin')} + +
+
+ : null} +

{__('Bandi disponibili', 'gepafin')}