From bff80aa465d1f0c38bd3c9451440444897407375 Mon Sep 17 00:00:00 2001 From: lcucuzzella Date: Fri, 18 Oct 2024 16:35:59 +0200 Subject: [PATCH] feat:(monitoraggio-caricamenti): modifiche grafiche filtri ricerca avanzata 20241018 --- .../MonitoraggioCaricamenti/monitoring.scss | 74 ++++++++++++++++--- .../MonitoraggioCaricamenti/monitoring.tsx | 2 +- .../monitoringSearchFilters.tsx | 27 ++----- 3 files changed, 72 insertions(+), 31 deletions(-) diff --git a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.scss b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.scss index 99650b55f..570108b9f 100644 --- a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.scss +++ b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.scss @@ -67,8 +67,9 @@ .chip { border: 1px solid #dfe4f2 !important; - .icon{ - fill:#5C6F81; + + .icon { + fill: #5C6F81; } } } @@ -140,26 +141,28 @@ input#dateInputDataFine { .chipRemove .clickable-area { pointer-events: auto; cursor: pointer !important; - :hover{ + + :hover { background-color: transparent !important; } - + } -.chip:hover:not(.chip-disabled){ +.chip:hover:not(.chip-disabled) { fill: #06c !important; background-color: #fcfdff; } -.chip-label{ +.chip-label { color: #5C6F81; } -.chip:hover:not(.chip-disabled) .chip-label{ +.chip:hover:not(.chip-disabled) .chip-label { color: #5C6F81; } -.chip:hover:not(.chip-disabled) button .icon, .chip:hover:not(.chip-disabled)>.icon{ +.chip:hover:not(.chip-disabled) button .icon, +.chip:hover:not(.chip-disabled)>.icon { fill: #5C6F81 } @@ -168,9 +171,58 @@ input#dateInputDataFine { &__single-value { color: #0066CC !important; font-weight: 600 !important; - + &--is-disabled { - color: #0066CC !important; + color: #0066CC !important; } - } + } +} + +.customArrowSelect { + position: relative; + /* Per consentire al ::after di posizionarsi rispetto al contenitore */ +} + +.customArrowSelect::after { + content: ''; + background-image: url('../../../../public/assets/img/it-expand-primary.png'); + background-size: contain; + background-repeat: no-repeat; + display: inline-block; + width: 30px; + /* Regola la dimensione secondo necessità */ + height: 30px; + /* Regola la dimensione secondo necessità */ + position: absolute; + right: 10px; + /* Regola la distanza dal bordo destro */ + top: 50%; + transform: translateY(-50%); + /* Per centrare verticalmente */ + pointer-events: none; + fill: #0066CC; +} + +.collapse-header { + display: inline !important; + + button::before { + line-height: 2rem !important; + } +} + +.collapse-body{ + box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.08); +} + +// .collapsed::before{ +// line-height: 2rem !important; +// } + +.custom-accordion { + span { + font-size: 24px; + font-weight: 600px; + } + } \ No newline at end of file diff --git a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.tsx b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.tsx index 6d2dc874d..7ec3760ac 100644 --- a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.tsx +++ b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.tsx @@ -179,7 +179,7 @@ const Monitoring: React.FC = ({ -
+
Risultati ({numeroRisultati}) diff --git a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoringSearchFilters.tsx b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoringSearchFilters.tsx index d93a3ed76..fa3862556 100644 --- a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoringSearchFilters.tsx +++ b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoringSearchFilters.tsx @@ -255,7 +255,7 @@ const MonitoringSearchFilters: React.FC = ({ formValues
= ({ formValues // color='primary' className={clsx( { - 'col-11 pl-0 ': isSearchable, - 'deleteArrowInSelect': isDisabled || isSearchable + 'col-12 pl-0 ': isSearchable, + 'col-12 pl-0 ': !isSearchable, + 'deleteArrowInSelect': isDisabled || isSearchable || !isSearchable, + 'customArrowSelect': !isSearchable && !isDisabled } )} classNamePrefix={clsx( @@ -300,21 +302,6 @@ const MonitoringSearchFilters: React.FC = ({ formValues {...(isSearchable && { menuIsOpen: enteInputValue.length > 3 })} onInputChange={(value) => setEnteInputValue(value)} /> - {isSearchable && -
- -
- }
) }; @@ -349,7 +336,9 @@ const MonitoringSearchFilters: React.FC = ({ formValues return (
- {renderSelect('ente', 'Ente', multiOptions, true, handleSelectChange, "Inizia a scrivere il nome dell'ente...", formValues?.intervento?.value != '' || formValues?.programma?.value != '' || formValues?.progetto?.value != '')} + {renderSelect('ente', 'Ente', multiOptions, true, handleSelectChange, + "Inizia a scrivere il nome dell'ente...", + formValues?.intervento?.value != '' || formValues?.programma?.value != '' || formValues?.progetto?.value != '')} {renderSelect('intervento', 'Intervento', [ { value: 'rfd', label: 'RFD' }, { value: 'scd', label: 'SCD' },