- saving progress;

environments/dev/dev.env

@@ -4,4 +4,5 @@ REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit
 REACT_APP_LOGO_FILENAME=gepafin-logo.svg
 REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
 REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs
-REACT_APP_EVALUATION_FLOW_ID=1
+REACT_APP_EVALUATION_FLOW_ID=1
+REACT_APP_LOCAL_DEVELOPMENT=0

environments/prod/prod.env

@@ -4,4 +4,5 @@ REACT_APP_API_ADDRESS=https://bandi-api.gepafin.it
 REACT_APP_LOGO_FILENAME=gepafin-logo.svg
 REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
 REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs
-REACT_APP_EVALUATION_FLOW_ID=1
+REACT_APP_EVALUATION_FLOW_ID=1
+REACT_APP_LOCAL_DEVELOPMENT=0

src/assets/scss/components/appPage.scss

@@ -43,6 +43,10 @@
         margin-left: 10px;
         text-transform: uppercase;
     }
+
+    span.companyName {
+        margin: 0;
+    }
 }
 
 .appPage__spacer {

src/assets/scss/components/fieldsRepeater.scss

@@ -0,0 +1,23 @@
+.fieldsRepeater {
+
+}
+
+.fieldsRepeater form {
+  display: contents;
+}
+
+.fieldsRepeater__panel {
+
+}
+
+.fieldsRepeater__heading {
+
+}
+
+.fieldsRepeater__fields {
+
+}
+
+.fieldsRepeater__addNew {
+  margin-top: 30px;
+}

src/assets/scss/theme.scss

@@ -43,4 +43,5 @@
 @import "./components/flowBuilder.scss";
 @import "./components/error404.scss";
 @import "./components/myTable.scss";
-@import "./components/evaluation.scss";
+@import "./components/evaluation.scss";
+@import "./components/fieldsRepeater.scss";

src/pages/Applications/index.js

@@ -1,6 +1,10 @@
 import React from 'react';
 import { __ } from '@wordpress/i18n';
 import { useNavigate } from 'react-router-dom';
+import { head } from 'ramda';
+
+// store
+import { storeGet, useStore } from '../../store';
 
 // components
 import MyLatestSubmissionsTable from '../DashboardBeneficiario/components/MyLatestSubmissionsTable';
@@ -9,15 +13,20 @@ import ErrorBoundary from '../../components/ErrorBoundary';
 
 const Applications = () => {
     const navigate = useNavigate();
+    const chosenCompanyId = useStore().main.chosenCompanyId();
+    const companies = useStore().main.companies();
+    const company = head(companies.filter(o => o.id === chosenCompanyId));
 
     const gotToBandiDisponibili = () => {
         navigate('/bandi')
     }
 
+    console.log('company', company, chosenCompanyId, companies)
     return(
         <div className="appPage">
             <div className="appPage__pageHeader">
                 <h1>{__('Domande in Lavorazione', 'gepafin')}</h1>
+                {/*{company ? <span className="companyName">{company.companyName}</span> : null}*/}
             </div>
 
             <div className="appPage__spacer"></div>

src/pages/DomandaEditPreInstructor/components/RepeaterFields/index.js

@@ -21,12 +21,14 @@ const RepeaterFields = ({ sourceId, sourceName }) => {
         setValue,
         register,
         trigger,
-        getValues
+        getValues,
+        watch
     } = useForm({
         defaultValues: useMemo(() => {
             return formInitialData;
         }, [formInitialData]), mode: 'onChange'
     });
+    const watchName = watch('name');
 
     const onSubmit = () => {
     };
@@ -49,19 +51,20 @@ const RepeaterFields = ({ sourceId, sourceName }) => {
     }
 
     useEffect(() => {
+        trigger();
+    }, [chosen]);
 
-    }, [chosen])
     console.log('items', items);
     return (
         <div className="fieldsRepeater">
             <form className="appForm" onSubmit={handleSubmit(onSubmit)}>
                 {items
-                    ? items.map(o => <div key={o.fieldId}>
+                    ? items.map(o => <div key={o.fieldId} className="fieldsRepeater__panel p-panel p-component">
-                            <div className="fieldsRepeater__Heading">
+                            <div className="fieldsRepeater__heading p-panel p-panel-header">
-                                <span>{o.name}</span>
+                                <span>{chosen.fieldId === o.fieldId ? watchName : o.name}</span>
                             </div>
                             {chosen.fieldId === o.fieldId
-                                ? <div className="fieldsRepeater__fields">
+                                ? <div className="fieldsRepeater__fields p-panel-content">
                                     <FormField
                                         type="textinput"
                                         fieldName="name"
@@ -91,6 +94,7 @@ const RepeaterFields = ({ sourceId, sourceName }) => {
                     ) : null}
             </form>
             <Button
+                className="fieldsRepeater__addNew"
                 type="button"
                 disabled={false}
                 onClick={addNew}

src/pages/DomandaEditPreInstructor/index.js

@@ -535,10 +535,10 @@ const DomandaEditPreInstructor = () => {
                         </div>
                     </div>
 
-                    <div className="appPageSection">
+                    {/*<div className="appPageSection">
                         <h2>{__('Documenti aggiuntivi', 'gepafin')}</h2>
                         <RepeaterFields sourceId={id} sourceName="evaluation"/>
-                    </div>
+                    </div>*/}
 
                     <div className="appPageSection">
                         <h2>{__('Checklist Valutazione', 'gepafin')}</h2>
@@ -589,7 +589,7 @@ const DomandaEditPreInstructor = () => {
                         </div>
                     </div>
 
-                    <div className="appPageSection">
+                    {/*<div className="appPageSection">
                         <h2>{__('Documenti di soccorso', 'gepafin')}</h2>
                         <ListOfFiles
                             files={data.files}
@@ -598,7 +598,7 @@ const DomandaEditPreInstructor = () => {
                             name="files"
                             ndg={data.ndg}
                             applicationId={id}/>
-                    </div>
+                    </div>*/}
 
                     <div className="appPageSection">
                         <h2>{__('Punteggi di valutazione', 'gepafin')}</h2>

src/service/network-service.js

@@ -8,8 +8,8 @@ export class NetworkService {
     static REFRESH_TOKEN_KEY
 
     static logApiError = (endpoint, status = 0, resp = {}) => {
-        console.log('status:', status);
         if (status === 500) {
+            console.log('status:', status, LOCAL_DEVELOPMENT);
             if (LOCAL_DEVELOPMENT !== '1') {
                 try {
                     Sentry.init({