- updated sviluppumbria logo;

- updated templates for pre instructor;

.env

@@ -1,6 +1,6 @@
 REACT_APP_TAB_TITLE=Gepafin
 REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1
 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit
-REACT_APP_LOGO_FILENAME=gepafin-logo.svg
+REACT_APP_LOGO_FILENAME=sviluppumbria-logo.png
 REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
 REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs

src/assets/scss/components/layout.scss

@@ -35,7 +35,7 @@ img {
 }
 
 .appLogo {
-  height: 50px;
+  height: 150px;
 }
 
 .inner {

src/assets/scss/components/misc.scss

@@ -113,16 +113,15 @@
   background-color: rgba(255,255,255,0.3)
 }
 
-.p-inputgroup {
-  align-items: center;
-}
-
 .p-accordion-header-text, .p-accordion-content {
   p {
     margin: 0;
   }
 }
 
+.p-inputgroup.flex-1 {
+  align-items: center;
+}
 .flex-1 {
   display: flex;
   align-items: center;

src/assets/scss/components/topBar.scss

@@ -1,5 +1,9 @@
 .topBar {
-    background: var(--horizontalMenu-background)
+    padding: 0.5rem 1rem;
+    background: var(--horizontalMenu-background);
+}
+.topBar .appLogo {
+    height: 70px;
 }
 .topBar__endContent {
     display: flex;

src/layouts/DefaultLayout/components/AppSidebar/index.js

@@ -50,7 +50,7 @@ const AppSidebar = () => {
         {
             label: __('Domande da valutare', 'gepafin'),
             icon: 'pi pi-calendar-clock',
-            href: '/valutazioni',
+            href: '/domande',
             id: 6,
             enable: intersection(permissions, ['EVALUATE_APPLICATIONS']).length
         },

src/pages/BandoApplication/index.js

@@ -627,15 +627,16 @@ const BandoApplication = () => {
                         </div>
                         : null}
 
-                    <div className="appPageSection">
+                    {'DRAFT' !== applicationStatus
-                        <Button
+                        ? <div className="appPageSection">
-                            type="button"
+                            <Button
-                            disabled={'READY' !== applicationStatus}
+                                type="button"
-                            onClick={onSubmit}
+                                disabled={'READY' !== applicationStatus}
-                            label={__('Invia', 'gepafin')}
+                                onClick={onSubmit}
-                            icon="pi pi-download"
+                                label={__('Invia', 'gepafin')}
-                            iconPos="right"/>
+                                icon="pi pi-check"
-                    </div>
+                                iconPos="right"/>
+                        </div> : null}
 
                     <div className="appPage__spacer"></div>
 

src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js

@@ -1,12 +1,13 @@
 import React, { useState, useEffect} from 'react';
 import { __ } from '@wordpress/i18n';
 import { is, uniq } from 'ramda';
+import { Link } from 'react-router-dom';
 
 // store
-//import { storeSet, storeGet } from '../../../../store';
+import { useStore } from '../../../../store';
 
 // api
-//import ApplicationService from '../../../../service/application-service';
+import AssignedApplicationService from '../../../../service/assigned-application-service';
 
 // components
 import { FilterMatchMode, FilterOperator } from 'primereact/api';
@@ -18,8 +19,6 @@ import { InputIcon } from 'primereact/inputicon';
 import { Button } from 'primereact/button';
 import { Calendar } from 'primereact/calendar';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
-import AssignedApplicationService from '../../../../service/assigned-application-service';
-import { useStore } from '../../../../store';
 
 
 const PreInstructorDomandeTable = () => {
@@ -128,10 +127,13 @@ const PreInstructorDomandeTable = () => {
     };
 
     const actionsBodyTemplate = (rowData) => {
-        return <Button severity="info"
+        /*return <Button severity="info"
                        onClick={() => createEvaluation(rowData.id)}
                        label={__('Valuta', 'gepafin')}
-                       icon="pi pi-pencil" size="small" iconPos="right" />
+                       icon="pi pi-pencil" size="small" iconPos="right" />*/
+        return <Link to={`/domande/${rowData.id}`}>
+            <Button severity="info" label={__('Valuta', 'gepafin')} icon="pi pi-eye" size="small" iconPos="right"/>
+        </Link>
     }
 
     const header = renderHeader();

src/pages/DashboardPreInstructor/index.js

@@ -20,7 +20,7 @@ const DashboardPreInstructor = () => {
     //const [mainStats, setMainStats] = useState({});
 
     const goToAllEvaluations = () => {
-        navigate('/valutazioni');
+        navigate('/domande');
     }
 
     return(

src/pages/Users/components/AllUsersTable/index.js

@@ -135,12 +135,12 @@ const AllUsersTable = () => {
         return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)}/>;
     };
 
-    const actionsBodyTemplate = (rowData) => {
+    /*const actionsBodyTemplate = (rowData) => {
-        /*return <Link to={`/utenti/${rowData.id}`}>
+        /!*return <Link to={`/utenti/${rowData.id}`}>
             <Button severity="info" label={__('Modifica', 'gepafin')} icon="pi pi-pencil" size="small" iconPos="right"/>
-        </Link>*/
+        </Link>*!/
         return null;
-    }
+    }*/
 
     const header = renderHeader();
 
@@ -169,8 +169,8 @@ const AllUsersTable = () => {
                         filterField="lastLogin" dataType="date"
                         style={{ minWidth: '10rem' }}
                         body={dateLastAccessBodyTemplate} filter filterElement={dateFilterTemplate}/>
-                <Column header={__('Azioni', 'gepafin')}
+                {/*<Column header={__('Azioni', 'gepafin')}
-                        body={actionsBodyTemplate}/>
+                        body={actionsBodyTemplate}/>*/}
             </DataTable>
         </div>
     )

src/routes.js

@@ -84,7 +84,12 @@ const routes = ({ role, chosenCompanyId }) => {
                 <Route path="/domande" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <Domande/> : null}
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
-                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <Evaluations/> : null}
+                </DefaultLayout>}/>
+                <Route path="/domande/:id/" element={<DefaultLayout>
+                    {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
+                    {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <EvaluationEdit/> : null}
                 </DefaultLayout>}/>
                 <Route path="/imieibandi" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
@@ -96,16 +101,6 @@ const routes = ({ role, chosenCompanyId }) => {
                     {'ROLE_BENEFICIARY' === role ? <BandoApplication/> : null}
                     {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
-                <Route path="/valutazioni" element={<DefaultLayout>
-                    {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
-                    {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
-                    {'ROLE_PRE_INSTRUCTOR' === role ? <Evaluations/> : null}
-                </DefaultLayout>}/>
-                <Route path="/valutazioni/:id/" element={<DefaultLayout>
-                    {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
-                    {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
-                    {'ROLE_PRE_INSTRUCTOR' === role ? <EvaluationEdit/> : null}
-                </DefaultLayout>}/>
                 <Route path="/profilo" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <Profile/> : null}
                     {'ROLE_BENEFICIARY' === role ? <ProfileBeneficiario/> : null}