From b140e0e6884451c6c2a8bc830eafa311df74572a Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Wed, 2 Jul 2025 10:06:11 +0200
Subject: [PATCH 1/4] change button in instructor manager dashboard

---
 .../index.js                                  | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
index c696101..dffd9bd 100644
--- a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
+++ b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
@@ -130,21 +130,20 @@ const LatestBandiTableInstructorManagerAsync = () => {
                     size="small"
                     icon="pi pi-receipt"
                     iconPos="right"
-                    label={__('CSV', 'gepafin')}
-                    onClick={() => exportToCSV(rowData.id)}/>
+                    label={__('Scarica graduatoria', 'gepafin')}
+                    onClick={() => handleDownloadRanking(rowData.id)}
+                    />
         </div>
     }
 
-    const exportToCSV = (applicationId) => {
+    const handleDownloadRanking = (callId) => {
         setLocalAsyncRequest(true);
-        ApplicationService.downloadCsvReport(
-            applicationId,
-            (resp) => getCsvReportback(resp, applicationId),
-            errCsvReportCallback
-        )
+        ApplicationService.downloadRanking(callId,
+            (resp) => downloadSuccessCallback(resp, callId),
+                downloadErrorCallback)
     }
 
-    const getCsvReportback = (resp, applicationId) => {
+    const downloadSuccessCallback = (resp, applicationId) => {
         const file = new Blob([resp], { type: 'text/csv' });
         const url = window.URL.createObjectURL(file);
         const link = document.createElement('a');
@@ -156,7 +155,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
         setLocalAsyncRequest(false);
     }
 
-    const errCsvReportCallback = (resp) => {
+    const downloadErrorCallback = (resp) => {
         set404FromErrorResponse(resp);
         setLocalAsyncRequest(false);
     }

From b67246a17c2e30243e1a85529330a321b3bb1f5d Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Wed, 2 Jul 2025 10:18:40 +0200
Subject: [PATCH 2/4] change style

---
 .../components/LatestBandiTableInstructorManagerAsync/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
index dffd9bd..bba95ad 100644
--- a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
+++ b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
@@ -128,7 +128,8 @@ const LatestBandiTableInstructorManagerAsync = () => {
         return <div className="appPageSection__tableActions">
             <Button type="button"
                     size="small"
-                    icon="pi pi-receipt"
+                    severity="info"
+                    icon="pi pi-download"
                     iconPos="right"
                     label={__('Scarica graduatoria', 'gepafin')}
                     onClick={() => handleDownloadRanking(rowData.id)}

From 79f25449176b411b3af1e5febcb24d1407932124 Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Wed, 2 Jul 2025 10:46:20 +0200
Subject: [PATCH 3/4] display only published in instructor manager

---
 .../index.js                                      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
index bba95ad..1896e10 100644
--- a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
+++ b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useCallback } from 'react';
+import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import { __ } from '@wordpress/i18n';
 
 import translationStrings from '../../../../translationStringsForComponents';
@@ -39,10 +39,15 @@ const LatestBandiTableInstructorManagerAsync = () => {
             name: { value: null, matchMode: 'contains' },
             startDate: { value: null, matchMode: 'dateIs' },
             endDate: { value: null, matchMode: 'dateIs' },
-            status: { value: null, matchMode: 'equals' }
+            status: { value: 'PUBLISH', matchMode: 'equals' }
         }
     });
-    const statuses = ['PUBLISH', 'EXPIRED'];
+    const statuses = ['PUBLISH'];
+
+    // const displayedItems = useMemo(()=>{
+    //     if(!items) return null;
+    //     return items.filter(item => item.status === 'PUBLISH');
+    // },[items])
 
     const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
 
@@ -172,7 +177,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
                 name: { value: null, matchMode: 'contains' },
                 startDate: { value: null, matchMode: 'dateIs' },
                 endDate: { value: null, matchMode: 'dateIs' },
-                status: { value: null, matchMode: 'equals' }
+                status: { value: 'PUBLISH', matchMode: 'equals' }
             }
         });
     };
@@ -192,7 +197,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
         const paginationQuery = getPaginationQuery();
 
         BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
-    }, [lazyState]);
+    }, [lazyState, getPaginationQuery]);
 
     return (
         <div className="appPageSection__table">

From 4d9ac87d89b6f846a7849fc552ffd16e6efcaa9e Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Wed, 2 Jul 2025 10:57:29 +0200
Subject: [PATCH 4/4] remove items in draft status

---
 .../components/AllBandiPreInstructorTableAsync/index.js     | 5 +++--
 .../Dashboard/components/LatestBandiTableAsync/index.js     | 6 +++---
 .../LatestBandiTableInstructorManagerAsync/index.js         | 5 -----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
index 1ca8a0d..2356004 100644
--- a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
+++ b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
@@ -45,10 +45,11 @@ const AllBandiPreInstructorTableAsync = () => {
         }
     });
     const statuses = ['DRAFT', 'PUBLISH', 'EXPIRED'];
+    const initialFetchStatuses = ['PUBLISH', 'EXPIRED'];
 
     const role = storeGet('getRole')
 
-    const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
+    const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, initialFetchStatuses, 'id'), [lazyState]);
 
     const onPage = (event) => {
         setLazyState(event);
@@ -174,7 +175,7 @@ const AllBandiPreInstructorTableAsync = () => {
         const paginationQuery = getPaginationQuery();
 
         BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
-    }, [lazyState]);
+    }, [lazyState, getPaginationQuery]);
 
     return (
         <div className="appPageSection__table">
diff --git a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js
index b5b29de..548ad9a 100644
--- a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js
+++ b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js
@@ -40,10 +40,10 @@ const LatestBandiTableAsync = () => {
             name: { value: null, matchMode: 'contains' },
             startDate: { value: null, matchMode: 'dateIs' },
             endDate: { value: null, matchMode: 'dateIs' },
-            status: { value: null, matchMode: 'equals' }
+            status: { value: 'PUBLISH', matchMode: 'equals' }
         }
     });
-    const statuses = ['PUBLISH', 'EXPIRED'];
+    const statuses = ['PUBLISH'];
 
     const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
 
@@ -197,7 +197,7 @@ const LatestBandiTableAsync = () => {
         const paginationQuery = getPaginationQuery();
 
         BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
-    }, [lazyState]);
+    }, [lazyState, getPaginationQuery]);
 
     return (
         <div className="appPageSection__table">
diff --git a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
index 1896e10..1bd8030 100644
--- a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
+++ b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
@@ -44,11 +44,6 @@ const LatestBandiTableInstructorManagerAsync = () => {
     });
     const statuses = ['PUBLISH'];
 
-    // const displayedItems = useMemo(()=>{
-    //     if(!items) return null;
-    //     return items.filter(item => item.status === 'PUBLISH');
-    // },[items])
-
     const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
 
     const onPage = (event) => {