fix(monitoraggio-caricamenti): fix impaginazione tabella e chips 2024…

…1015
teamdigitale · Oct 15, 2024 · 47da0d3 · 47da0d3
1 parent 81ffc51
commit 47da0d3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/fe-piattaforma/src/components/Table/view/tableDesktop.tsx b/fe-piattaforma/src/components/Table/view/tableDesktop.tsx
@@ -91,8 +91,7 @@ const TableDesktop: React.FC<TableI> = (props) => {
                     'table-container__intestazione'
                   )}
                 >
-                  {/* <div > style={{ display: 'flex', alignItems: 'center' }}> */}
-                  <div>
+                  <div style={{ display: 'flex', alignItems: 'center' }}>
                     <span>{th.label.toUpperCase()}</span>
                     {canSort && onSort ? (
                       <Icon

diff --git a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.scss b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.scss
@@ -80,12 +80,12 @@
 
 .table-compact {
     font-family: Titillium Web;
-    font-size: 18px;
+    font-size: 17px;
     font-weight: 400;
     line-height: 28px;
 
     td {
-        padding: 20px 15px;
+        padding: 20px 10px;
     }
 
     span#enteColumn,
@@ -132,6 +132,7 @@ input#dateInputDataFine {
     position: relative;
     pointer-events: none;
     display: inline-block;
+    padding: 0px 0px;
 }
 
 .chipRemove .clickable-area {

diff --git a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.tsx b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoring.tsx
@@ -95,7 +95,11 @@ const Monitoring: React.FC<MonitoringI> = ({
     setTableValues(updateTableValues());
   }, [caricamentiList]);
 
-
+  const formatDate = (dateString: string) => {
+    const options: Intl.DateTimeFormatOptions = { day: '2-digit', month: '2-digit', year: 'numeric' };
+    return new Date(dateString).toLocaleDateString('it-IT', options);
+  };
+
   const updateTableValues = () => {
     let table;
     if(caricamentiList.length > 0) {
@@ -104,7 +108,7 @@ const Monitoring: React.FC<MonitoringI> = ({
         caricamentiList.map((td: any) => {
         return {
           idProgetto: td.idProgetto,
-          data: <span id='dataColumn'><b>{td.dataCaricamenti}</b></span>,
+          data: <span id='dataColumn'><b>{formatDate(td.dataCaricamenti)}</b></span>,
           ente: <span id='enteColumn'>{td.nomeEnte}</span>,
           intervento: <span id='interventoColumn'>{td.intervento}</span>,
           progetto: <span id='progettoColumn'>{td.nomeProgetto}</span>,

diff --git a/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoringSearchFilters.tsx b/fe-piattaforma/src/pages/administrator/MonitoraggioCaricamenti/monitoringSearchFilters.tsx
@@ -179,7 +179,7 @@ const MonitoringSearchFilters: React.FC<MonitoringSearchFilterI> = ({ formValues
 
   const handleDateInputChange = (value: any, field: string) => {
     const formattedDate = typeof value === 'string' ? value : new Date(value).toISOString().split('T')[0];
-
+    
     setFormValues(() => {
       let newForm = { ...formValues };
       let newDateValid = { ...isDateValid };
@@ -407,7 +407,7 @@ const MonitoringSearchFilters: React.FC<MonitoringSearchFilterI> = ({ formValues
       <Form.Row className='justify-content-start mt-5 chipsRow'>
         {chips.map((chip, index) => (
           <Button className='chipRemove' onClick={() => removeChip(chip)}>
-            <Chip key={index} className='mr-2 rounded-pill'>
+            <Chip key={index} className='mr-1 ml-0 rounded-pill'>
               <ChipLabel className='mx-1 my-1'>
                 {chip}
               </ChipLabel>