Merge pull request #8 from Kitzanos/feature/68-published-call-editable-fields
Feature/68 published call editable fields
This commit is contained in:
@@ -147,6 +147,7 @@
|
|||||||
.appForm__fileUploadItemName {
|
.appForm__fileUploadItemName {
|
||||||
color: var(--global-textColor);
|
color: var(--global-textColor);
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.appForm__row {
|
.appForm__row {
|
||||||
|
|||||||
@@ -118,6 +118,10 @@
|
|||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.p-dropdown-panel {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.p-inputgroup.flex-1 {
|
.p-inputgroup.flex-1 {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ const FormFieldRepeater = ({
|
|||||||
const properField = (item, i) => {
|
const properField = (item, i) => {
|
||||||
return !isNil(item.lookUpDataId)
|
return !isNil(item.lookUpDataId)
|
||||||
? <Dropdown value={item.value}
|
? <Dropdown value={item.value}
|
||||||
|
filter
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
onChange={(e) => selectItem(e, i)}
|
onChange={(e) => selectItem(e, i)}
|
||||||
optionDisabled={(opt) => usedExistingValues().includes(opt.value)}
|
optionDisabled={(opt) => usedExistingValues().includes(opt.value)}
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ const FormFieldRepeaterCriteria = ({
|
|||||||
const properField = (item, i) => {
|
const properField = (item, i) => {
|
||||||
return !isNil(item.lookUpDataId)
|
return !isNil(item.lookUpDataId)
|
||||||
? <Dropdown value={item.value}
|
? <Dropdown value={item.value}
|
||||||
|
filter
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
onChange={(e) => selectItem(e, i)}
|
onChange={(e) => selectItem(e, i)}
|
||||||
optionDisabled={(opt) => usedExistingValues().includes(opt.value)}
|
optionDisabled={(opt) => usedExistingValues().includes(opt.value)}
|
||||||
|
|||||||
@@ -182,6 +182,7 @@ const FormFieldRepeaterFaq = ({
|
|||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
icon="pi pi-plus" onClick={addNewItem}/>
|
icon="pi pi-plus" onClick={addNewItem}/>
|
||||||
<Dropdown onChange={(e) => selectItem(e)}
|
<Dropdown onChange={(e) => selectItem(e)}
|
||||||
|
filter
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
optionDisabled={(opt) => usedExistingValues().includes(opt.title)}
|
optionDisabled={(opt) => usedExistingValues().includes(opt.title)}
|
||||||
options={stateOptionsData}
|
options={stateOptionsData}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useState, useEffect} from 'react';
|
import React, { useState, useEffect} from 'react';
|
||||||
import { __ } from '@wordpress/i18n';
|
import { __ } from '@wordpress/i18n';
|
||||||
import { is, uniq, isNil } from 'ramda';
|
import { is, uniq, isNil, isEmpty } from 'ramda';
|
||||||
import { wrap } from 'object-path-immutable';
|
import { wrap } from 'object-path-immutable';
|
||||||
|
|
||||||
// store
|
// store
|
||||||
@@ -28,6 +28,7 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse
|
|||||||
|
|
||||||
|
|
||||||
const AllBandiAccordion = () => {
|
const AllBandiAccordion = () => {
|
||||||
|
const chosenCompanyId = useStore().main.chosenCompanyId();
|
||||||
const isAsyncRequest = useStore().main.isAsyncRequest();
|
const isAsyncRequest = useStore().main.isAsyncRequest();
|
||||||
const [items, setItems] = useState(null);
|
const [items, setItems] = useState(null);
|
||||||
const [filters, setFilters] = useState(null);
|
const [filters, setFilters] = useState(null);
|
||||||
@@ -113,11 +114,11 @@ const AllBandiAccordion = () => {
|
|||||||
<div className="p-3">
|
<div className="p-3">
|
||||||
{renderHtmlContent(data.descriptionShort)}
|
{renderHtmlContent(data.descriptionShort)}
|
||||||
<p>{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}</p>
|
<p>{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}</p>
|
||||||
{!data.confidi
|
{!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && !data.confidi
|
||||||
? <Button onClick={() => goToBandoPage(data.id)} severity="info">
|
? <Button onClick={() => goToBandoPage(data.id)} severity="info">
|
||||||
{__('Partecipa', 'gepafin')}
|
{__('Partecipa', 'gepafin')}
|
||||||
</Button> : null}
|
</Button> : null}
|
||||||
{data.confidi
|
{!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi
|
||||||
? <Button onClick={() => goToBandoPage(data.id)} severity="info">
|
? <Button onClick={() => goToBandoPage(data.id)} severity="info">
|
||||||
{__('Mostra', 'gepafin')}
|
{__('Mostra', 'gepafin')}
|
||||||
</Button> : null}
|
</Button> : null}
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { __ } from '@wordpress/i18n';
|
import { __ } from '@wordpress/i18n';
|
||||||
import { useNavigate } from 'react-router-dom';
|
|
||||||
|
|
||||||
// components
|
// components
|
||||||
import AllBandiAccordion from './components/AllBandiAccordion';
|
import AllBandiAccordion from './components/AllBandiAccordion';
|
||||||
import { Button } from 'primereact/button';
|
|
||||||
|
|
||||||
const BandiBeneficiario = () => {
|
const BandiBeneficiario = () => {
|
||||||
return(
|
return(
|
||||||
|
|||||||
@@ -5,14 +5,16 @@ import { isNil } from 'ramda';
|
|||||||
// components
|
// components
|
||||||
import { Button } from 'primereact/button';
|
import { Button } from 'primereact/button';
|
||||||
|
|
||||||
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn }) => {
|
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn, status }) => {
|
||||||
return (
|
return (
|
||||||
<div className="appPageSection">
|
<div className="appPageSection">
|
||||||
<div className="appPageSection__actions">
|
<div className="appPageSection__actions">
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={submitFn}
|
onClick={submitFn}
|
||||||
label={__('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/>
|
label={status === 'PUBLISH'
|
||||||
|
? __('Modifica', 'gepafin')
|
||||||
|
: __('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/>
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
disabled={isNil(id)}
|
disabled={isNil(id)}
|
||||||
|
|||||||
@@ -176,8 +176,13 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
storeSet.main.unsetAsyncRequest();
|
storeSet.main.unsetAsyncRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
const shouldDisableField = () => {
|
const shouldDisableField = (fieldName) => {
|
||||||
return values.status === 'PUBLISH'
|
return values.status === 'PUBLISH' &&
|
||||||
|
![
|
||||||
|
'descriptionShort', 'descriptionLong', 'documentationRequested', 'threshold',
|
||||||
|
'aimedTo', 'criteria', 'docs', 'checklist', 'faq', 'amount', 'amountMin', 'amountMax',
|
||||||
|
'email', 'phoneNumber', 'checkList', 'images'
|
||||||
|
].includes(fieldName)
|
||||||
}
|
}
|
||||||
|
|
||||||
useImperativeHandle(
|
useImperativeHandle(
|
||||||
@@ -239,7 +244,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
<UnsavedChangesDetector getValuesFn={getValues}/>
|
<UnsavedChangesDetector getValuesFn={getValues}/>
|
||||||
<FormField
|
<FormField
|
||||||
type="switch"
|
type="switch"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('confidi')}
|
||||||
fieldName="confidi"
|
fieldName="confidi"
|
||||||
label={__('Bando Confidi', 'gepafin')}
|
label={__('Bando Confidi', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -251,7 +256,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="textinput"
|
type="textinput"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('name')}
|
||||||
fieldName="name"
|
fieldName="name"
|
||||||
label={__('Titolo del Bando', 'gepafin')}
|
label={__('Titolo del Bando', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -262,7 +267,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="wysiwyg"
|
type="wysiwyg"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('descriptionShort')}
|
||||||
fieldName="descriptionShort"
|
fieldName="descriptionShort"
|
||||||
label={__('Descrizione breve', 'gepafin')}
|
label={__('Descrizione breve', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -275,7 +280,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="wysiwyg"
|
type="wysiwyg"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('descriptionLong')}
|
||||||
fieldName="descriptionLong"
|
fieldName="descriptionLong"
|
||||||
label={__('Descrizione completa', 'gepafin')}
|
label={__('Descrizione completa', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -291,7 +296,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormFieldRepeater
|
<FormFieldRepeater
|
||||||
data={values['aimedTo']}
|
data={values['aimedTo']}
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('aimedTo')}
|
||||||
setDataFn={setValue}
|
setDataFn={setValue}
|
||||||
fieldName="aimedTo"
|
fieldName="aimedTo"
|
||||||
options={aimedToOptions}
|
options={aimedToOptions}
|
||||||
@@ -310,7 +315,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="wysiwyg"
|
type="wysiwyg"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('documentationRequested')}
|
||||||
fieldName="documentationRequested"
|
fieldName="documentationRequested"
|
||||||
label={__('Documentazione richiesta', 'gepafin')}
|
label={__('Documentazione richiesta', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -334,7 +339,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
<div className="appForm__cols">
|
<div className="appForm__cols">
|
||||||
<FormField
|
<FormField
|
||||||
type="datepicker"
|
type="datepicker"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('startDate')}
|
||||||
fieldName="startDate"
|
fieldName="startDate"
|
||||||
label={__('Data di inizio', 'gepafin')}
|
label={__('Data di inizio', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -345,7 +350,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="datepicker"
|
type="datepicker"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('endDate')}
|
||||||
fieldName="endDate"
|
fieldName="endDate"
|
||||||
label={__('Data di fine', 'gepafin')}
|
label={__('Data di fine', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -358,7 +363,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
<div className="appForm__cols">
|
<div className="appForm__cols">
|
||||||
<FormField
|
<FormField
|
||||||
type="datepicker"
|
type="datepicker"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('startTime')}
|
||||||
fieldName="startTime"
|
fieldName="startTime"
|
||||||
label={__('Ora di inizio', 'gepafin')}
|
label={__('Ora di inizio', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -370,7 +375,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="datepicker"
|
type="datepicker"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('endTime')}
|
||||||
fieldName="endTime"
|
fieldName="endTime"
|
||||||
label={__('Ora di fine', 'gepafin')}
|
label={__('Ora di fine', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -384,7 +389,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
<div className="appForm__cols">
|
<div className="appForm__cols">
|
||||||
<FormField
|
<FormField
|
||||||
type="numberinput"
|
type="numberinput"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('amount')}
|
||||||
fieldName="amount"
|
fieldName="amount"
|
||||||
label={__('Dotazione del Bando', 'gepafin')}
|
label={__('Dotazione del Bando', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -397,7 +402,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="numberinput"
|
type="numberinput"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('amountMin')}
|
||||||
fieldName="amountMin"
|
fieldName="amountMin"
|
||||||
label={__('Importo minimo per Progetto', 'gepafin')}
|
label={__('Importo minimo per Progetto', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -410,7 +415,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="numberinput"
|
type="numberinput"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('amountMax')}
|
||||||
fieldName="amountMax"
|
fieldName="amountMax"
|
||||||
label={__('Importo massimo per Progetto', 'gepafin')}
|
label={__('Importo massimo per Progetto', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -425,7 +430,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
<div className="appForm__cols">
|
<div className="appForm__cols">
|
||||||
<FormField
|
<FormField
|
||||||
type="textinput"
|
type="textinput"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('email')}
|
||||||
fieldName="email"
|
fieldName="email"
|
||||||
label={__('Email', 'gepafin')}
|
label={__('Email', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -441,7 +446,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="textinput"
|
type="textinput"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('phoneNumber')}
|
||||||
fieldName="phoneNumber"
|
fieldName="phoneNumber"
|
||||||
label={__('Telefono', 'gepafin')}
|
label={__('Telefono', 'gepafin')}
|
||||||
control={control}
|
control={control}
|
||||||
@@ -457,6 +462,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormFieldRepeaterFaq
|
<FormFieldRepeaterFaq
|
||||||
data={values['faq']}
|
data={values['faq']}
|
||||||
|
disabled={shouldDisableField('faq')}
|
||||||
setDataFn={setValue}
|
setDataFn={setValue}
|
||||||
fieldName="faq"
|
fieldName="faq"
|
||||||
options={faqOptions}
|
options={faqOptions}
|
||||||
|
|||||||
@@ -206,8 +206,13 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const shouldDisableField = () => {
|
const shouldDisableField = (fieldName) => {
|
||||||
return values.status === 'PUBLISH'
|
return values.status === 'PUBLISH' &&
|
||||||
|
![
|
||||||
|
'descriptionShort', 'descriptionLong', 'documentationRequested', 'threshold',
|
||||||
|
'aimedTo', 'criteria', 'docs', 'checklist', 'faq', 'amount', 'amountMin', 'amountMax',
|
||||||
|
'email', 'phoneNumber', 'checkList', 'images'
|
||||||
|
].includes(fieldName)
|
||||||
}
|
}
|
||||||
|
|
||||||
const acceptAllFormats = () => {
|
const acceptAllFormats = () => {
|
||||||
@@ -219,7 +224,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
<UnsavedChangesDetector getValuesFn={getValues}/>
|
<UnsavedChangesDetector getValuesFn={getValues}/>
|
||||||
<FormFieldRepeaterCriteria
|
<FormFieldRepeaterCriteria
|
||||||
data={values}
|
data={values}
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('criteria')}
|
||||||
setDataFn={setValue}
|
setDataFn={setValue}
|
||||||
fieldName="criteria"
|
fieldName="criteria"
|
||||||
options={criteriaOptions}
|
options={criteriaOptions}
|
||||||
@@ -238,7 +243,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="fileuploadasync"
|
type="fileuploadasync"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('docs')}
|
||||||
setDataFn={setValue}
|
setDataFn={setValue}
|
||||||
fieldName="docs"
|
fieldName="docs"
|
||||||
label={__('Documentazione', 'gepafin')}
|
label={__('Documentazione', 'gepafin')}
|
||||||
@@ -257,7 +262,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormField
|
<FormField
|
||||||
type="fileuploadasync"
|
type="fileuploadasync"
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('images')}
|
||||||
setDataFn={setValue}
|
setDataFn={setValue}
|
||||||
fieldName="images"
|
fieldName="images"
|
||||||
label={__('Immagine del Bando', 'gepafin')}
|
label={__('Immagine del Bando', 'gepafin')}
|
||||||
@@ -273,7 +278,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
|
|||||||
|
|
||||||
<FormFieldRepeater
|
<FormFieldRepeater
|
||||||
data={values['checkList']}
|
data={values['checkList']}
|
||||||
disabled={shouldDisableField()}
|
disabled={shouldDisableField('checkList')}
|
||||||
setDataFn={setValue}
|
setDataFn={setValue}
|
||||||
fieldName="checkList"
|
fieldName="checkList"
|
||||||
options={checklistOptions}
|
options={checklistOptions}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { Button } from 'primereact/button';
|
|||||||
import { Tag } from 'primereact/tag';
|
import { Tag } from 'primereact/tag';
|
||||||
import BuilderElementProperLabel from '../BuilderElementProperLabel';
|
import BuilderElementProperLabel from '../BuilderElementProperLabel';
|
||||||
|
|
||||||
const BuilderElement = ({ id, name, label, index }) => {
|
const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
|
||||||
const draggingElementId = useStore().main.draggingElementId();
|
const draggingElementId = useStore().main.draggingElementId();
|
||||||
const ref = useRef(null);
|
const ref = useRef(null);
|
||||||
|
|
||||||
@@ -109,28 +109,10 @@ const BuilderElement = ({ id, name, label, index }) => {
|
|||||||
</div>
|
</div>
|
||||||
<div className="actions">
|
<div className="actions">
|
||||||
<Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/>
|
<Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/>
|
||||||
<Button icon="pi pi-trash" onClick={() => remove(id)} outlined severity="danger"/>
|
<Button icon="pi pi-trash" disabled={bandoStatus === 'PUBLISH'} onClick={() => remove(id)} outlined severity="danger"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|
||||||
/*return (
|
|
||||||
<div ref={ref} className="formBuilder__element" style={{ opacity }} data-handler-id={handlerId}>
|
|
||||||
{draggingId === id
|
|
||||||
? <div className="formBuilder__elementNew"></div>
|
|
||||||
: <>
|
|
||||||
<div className="meta">
|
|
||||||
<Tag value={name} severity="info"/>
|
|
||||||
<BuilderElementProperLabel id={id} defaultLabel={label}/>
|
|
||||||
</div>
|
|
||||||
<div className="actions">
|
|
||||||
<Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/>
|
|
||||||
<Button icon="pi pi-trash" onClick={() => remove(id)} outlined severity="danger"/>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
)*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default BuilderElement;
|
export default BuilderElement;
|
||||||
@@ -11,7 +11,7 @@ import { Editor } from 'primereact/editor';
|
|||||||
import { mimeTypes } from '../../../../../../configData';
|
import { mimeTypes } from '../../../../../../configData';
|
||||||
import ElementSettingTableColumns from '../ElementSettingTableColumns';
|
import ElementSettingTableColumns from '../ElementSettingTableColumns';
|
||||||
|
|
||||||
const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
|
const ElementSetting = ({ setting, changeFn, updateDataFn, bandoStatus }) => {
|
||||||
|
|
||||||
const settingLabels = {
|
const settingLabels = {
|
||||||
label: __('Label', 'gepafin'),
|
label: __('Label', 'gepafin'),
|
||||||
@@ -48,6 +48,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
|
|||||||
return <ElementSettingRepeater
|
return <ElementSettingRepeater
|
||||||
value={is(Array, setting.value) ? setting.value : []}
|
value={is(Array, setting.value) ? setting.value : []}
|
||||||
name={setting.name}
|
name={setting.name}
|
||||||
|
bandoStatus={bandoStatus}
|
||||||
setDataFn={updateDataFn}/>
|
setDataFn={updateDataFn}/>
|
||||||
} else if (setting.name === 'mime') {
|
} else if (setting.name === 'mime') {
|
||||||
return <MultiSelect
|
return <MultiSelect
|
||||||
@@ -75,6 +76,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
|
|||||||
return <ElementSettingTableColumns
|
return <ElementSettingTableColumns
|
||||||
value={is(Object, setting.value) ? setting.value : {}}
|
value={is(Object, setting.value) ? setting.value : {}}
|
||||||
name={setting.name}
|
name={setting.name}
|
||||||
|
bandoStatus={bandoStatus}
|
||||||
setDataFn={updateDataFn}/>
|
setDataFn={updateDataFn}/>
|
||||||
} else {
|
} else {
|
||||||
return <InputText id={setting.name} aria-describedby={`${setting.name}-help`}
|
return <InputText id={setting.name} aria-describedby={`${setting.name}-help`}
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ import uniqid from '../../../../../../helpers/uniqid';
|
|||||||
const ElementSettingRepeater = ({
|
const ElementSettingRepeater = ({
|
||||||
value,
|
value,
|
||||||
name,
|
name,
|
||||||
setDataFn
|
setDataFn,
|
||||||
|
bandoStatus
|
||||||
}) => {
|
}) => {
|
||||||
const [stateFieldData, setStateFieldData] = useState([]);
|
const [stateFieldData, setStateFieldData] = useState([]);
|
||||||
|
|
||||||
@@ -53,10 +54,10 @@ const ElementSettingRepeater = ({
|
|||||||
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
|
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
|
||||||
<div className="p-inputgroup flex-1">
|
<div className="p-inputgroup flex-1">
|
||||||
{properField(o, i)}
|
{properField(o, i)}
|
||||||
<Button icon="pi pi-times" className="p-button-danger" onClick={() => removeItem(i)}/>
|
<Button icon="pi pi-times" disabled={bandoStatus === 'PUBLISH'} className="p-button-danger" onClick={() => removeItem(i)}/>
|
||||||
</div>
|
</div>
|
||||||
</div>)}
|
</div>)}
|
||||||
<Button type="button" outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
|
<Button type="button" disabled={bandoStatus === 'PUBLISH'} outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ import uniqid from '../../../../../../helpers/uniqid';
|
|||||||
const ElementSettingTableColumns = ({
|
const ElementSettingTableColumns = ({
|
||||||
value,
|
value,
|
||||||
name,
|
name,
|
||||||
setDataFn
|
setDataFn,
|
||||||
|
bandoStatus
|
||||||
}) => {
|
}) => {
|
||||||
const [stateFieldData, setStateFieldData] = useState([]);
|
const [stateFieldData, setStateFieldData] = useState([]);
|
||||||
const [rowsData, setRowsData] = useState([]);
|
const [rowsData, setRowsData] = useState([]);
|
||||||
@@ -87,7 +88,10 @@ const ElementSettingTableColumns = ({
|
|||||||
<InputText value={item.label} onInput={(e) => onInputChange(e, i)}/>
|
<InputText value={item.label} onInput={(e) => onInputChange(e, i)}/>
|
||||||
<div className="flex-1">
|
<div className="flex-1">
|
||||||
<span>{__('Predefinito?', 'gepafin')}</span>
|
<span>{__('Predefinito?', 'gepafin')}</span>
|
||||||
<InputSwitch checked={item.predefined} onChange={(e) => setChecked(e.value, i)}/>
|
<InputSwitch
|
||||||
|
checked={item.predefined}
|
||||||
|
disabled={bandoStatus === 'PUBLISH'}
|
||||||
|
onChange={(e) => setChecked(e.value, i)}/>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
@@ -118,10 +122,10 @@ const ElementSettingTableColumns = ({
|
|||||||
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
|
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
|
||||||
<div className="p-inputgroup flex-1">
|
<div className="p-inputgroup flex-1">
|
||||||
{properField(o, i)}
|
{properField(o, i)}
|
||||||
<Button icon="pi pi-times" className="p-button-danger" onClick={() => removeItem(i)}/>
|
<Button icon="pi pi-times" disabled={bandoStatus === 'PUBLISH'} className="p-button-danger" onClick={() => removeItem(i)}/>
|
||||||
</div>
|
</div>
|
||||||
</div>)}
|
</div>)}
|
||||||
<Button type="button" outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
|
<Button type="button" disabled={bandoStatus === 'PUBLISH'} outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
|
||||||
</div>
|
</div>
|
||||||
{stateFieldData
|
{stateFieldData
|
||||||
.filter(o => o.predefined)
|
.filter(o => o.predefined)
|
||||||
@@ -138,7 +142,9 @@ const ElementSettingTableColumns = ({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
})}
|
})}
|
||||||
<Button type="button" outlined
|
<Button type="button"
|
||||||
|
outlined
|
||||||
|
disabled={bandoStatus === 'PUBLISH'}
|
||||||
label={__('Aggiungi una righa', 'gepafin')}
|
label={__('Aggiungi una righa', 'gepafin')}
|
||||||
onClick={addNewRow}/>
|
onClick={addNewRow}/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import ElementSetting from './components/ElementSetting';
|
|||||||
import { Dropdown } from 'primereact/dropdown';
|
import { Dropdown } from 'primereact/dropdown';
|
||||||
import { MultiSelect } from 'primereact/multiselect';
|
import { MultiSelect } from 'primereact/multiselect';
|
||||||
|
|
||||||
const BuilderElementSettings = ({ closeSettingsFn }) => {
|
const BuilderElementSettings = ({ closeSettingsFn, bandoStatus }) => {
|
||||||
const elements = useStore().main.formElements();
|
const elements = useStore().main.formElements();
|
||||||
const activeElement = useStore().main.activeElement();
|
const activeElement = useStore().main.activeElement();
|
||||||
const criteriaOptions = useStore().main.bandoCriteria();
|
const criteriaOptions = useStore().main.bandoCriteria();
|
||||||
@@ -162,6 +162,7 @@ const BuilderElementSettings = ({ closeSettingsFn }) => {
|
|||||||
? settings.map((o) => <ElementSetting
|
? settings.map((o) => <ElementSetting
|
||||||
key={o.name}
|
key={o.name}
|
||||||
setting={o}
|
setting={o}
|
||||||
|
bandoStatus={bandoStatus}
|
||||||
changeFn={onChange}
|
changeFn={onChange}
|
||||||
updateDataFn={onUpdateOptions}/>)
|
updateDataFn={onUpdateOptions}/>)
|
||||||
: null}
|
: null}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import BuilderElementSettings from '../BuilderElementSettings';
|
|||||||
import BuilderDropzone from '../BuilderDropzone';
|
import BuilderDropzone from '../BuilderDropzone';
|
||||||
import BlockingOverlay from '../../../../components/BlockingOverlay';
|
import BlockingOverlay from '../../../../components/BlockingOverlay';
|
||||||
|
|
||||||
const FormBuilder = () => {
|
const FormBuilder = ({ bandoStatus }) => {
|
||||||
const elements = useStore().main.formElements();
|
const elements = useStore().main.formElements();
|
||||||
const elementItems = useStore().main.elementItems();
|
const elementItems = useStore().main.elementItems();
|
||||||
const activeElement = useStore().main.activeElement();
|
const activeElement = useStore().main.activeElement();
|
||||||
@@ -27,9 +27,10 @@ const FormBuilder = () => {
|
|||||||
id={field.id}
|
id={field.id}
|
||||||
label={field.label}
|
label={field.label}
|
||||||
name={field.name}
|
name={field.name}
|
||||||
|
bandoStatus={bandoStatus}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}, []);
|
}, [bandoStatus]);
|
||||||
|
|
||||||
const renderItem = useCallback((item) => {
|
const renderItem = useCallback((item) => {
|
||||||
return (
|
return (
|
||||||
@@ -57,7 +58,7 @@ const FormBuilder = () => {
|
|||||||
<>
|
<>
|
||||||
<Sidebar visible={!isEmpty(activeElement)} onHide={closeSettings} className="formBuilder__elementSettings">
|
<Sidebar visible={!isEmpty(activeElement)} onHide={closeSettings} className="formBuilder__elementSettings">
|
||||||
<h2>{__('Impostazioni del campo modulo', 'gepafin')}</h2>
|
<h2>{__('Impostazioni del campo modulo', 'gepafin')}</h2>
|
||||||
{!isEmpty(activeElement) ? <BuilderElementSettings closeSettingsFn={closeSettings}/> : null}
|
{!isEmpty(activeElement) ? <BuilderElementSettings closeSettingsFn={closeSettings} bandoStatus={bandoStatus}/> : null}
|
||||||
</Sidebar>
|
</Sidebar>
|
||||||
<div className="formBuilder">
|
<div className="formBuilder">
|
||||||
<div className="formBuilder__main">
|
<div className="formBuilder__main">
|
||||||
|
|||||||
@@ -210,7 +210,6 @@ const BandoFormsEdit = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const errFormDeleteCallback = (data) => {
|
const errFormDeleteCallback = (data) => {
|
||||||
console.log('errFormDeleteCallback', data)
|
|
||||||
storeSet.main.unsetAsyncRequest();
|
storeSet.main.unsetAsyncRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -223,7 +222,6 @@ const BandoFormsEdit = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const errGetElementItemsCallbacks = (data) => {
|
const errGetElementItemsCallbacks = (data) => {
|
||||||
console.log('errGetElementItemsCallbacks', data)
|
|
||||||
storeSet.main.unsetAsyncRequest();
|
storeSet.main.unsetAsyncRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -246,9 +244,9 @@ const BandoFormsEdit = () => {
|
|||||||
|
|
||||||
const getBandoCallback = (data) => {
|
const getBandoCallback = (data) => {
|
||||||
if (data.status === 'SUCCESS') {
|
if (data.status === 'SUCCESS') {
|
||||||
|
setBandoStatus(data.data.status);
|
||||||
const criteria = pathOr([], ['data', 'criteria'], data);
|
const criteria = pathOr([], ['data', 'criteria'], data);
|
||||||
const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value}));
|
const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value}));
|
||||||
console.log('criteriaOptions', criteriaOptions);
|
|
||||||
storeSet.main.bandoCriteria(criteriaOptions);
|
storeSet.main.bandoCriteria(criteriaOptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -319,7 +317,7 @@ const BandoFormsEdit = () => {
|
|||||||
|
|
||||||
<div className="appPageSection">
|
<div className="appPageSection">
|
||||||
<DndProvider backend={HTML5Backend}>
|
<DndProvider backend={HTML5Backend}>
|
||||||
<FormBuilder/>
|
<FormBuilder bandoStatus={bandoStatus}/>
|
||||||
</DndProvider>
|
</DndProvider>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -334,7 +332,7 @@ const BandoFormsEdit = () => {
|
|||||||
label={__('Indietro', 'gepafin')} icon="pi pi-arrow-left" iconPos="left"/>
|
label={__('Indietro', 'gepafin')} icon="pi pi-arrow-left" iconPos="left"/>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => doSave()}
|
onClick={() => doSave()}
|
||||||
disabled={isAsyncRequest || 'PUBLISH' === bandoStatus}
|
disabled={isAsyncRequest}
|
||||||
label={__('Salva progressi', 'gepafin')} icon="pi pi-save" iconPos="right"/>
|
label={__('Salva progressi', 'gepafin')} icon="pi pi-save" iconPos="right"/>
|
||||||
<Button
|
<Button
|
||||||
outlined
|
outlined
|
||||||
|
|||||||
@@ -247,13 +247,15 @@ const BandoViewBeneficiario = () => {
|
|||||||
const header = renderHeader();
|
const header = renderHeader();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) {
|
||||||
const bandoId = getBandoId();
|
const bandoId = getBandoId();
|
||||||
storeSet.main.setAsyncRequest();
|
storeSet.main.setAsyncRequest();
|
||||||
BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback);
|
BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback);
|
||||||
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
|
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
|
||||||
['callId', bandoId],
|
['callId', bandoId],
|
||||||
['companyId', chosenCompanyId]
|
['companyId', chosenCompanyId]
|
||||||
])
|
]);
|
||||||
|
}
|
||||||
}, [id, chosenCompanyId]);
|
}, [id, chosenCompanyId]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { __ } from '@wordpress/i18n';
|
import { __ } from '@wordpress/i18n';
|
||||||
import { uniq } from 'ramda';
|
import { isEmpty, uniq } from 'ramda';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
|
|
||||||
// store
|
// store
|
||||||
import { storeSet } from '../../../../store';
|
import { storeSet, useStore } from '../../../../store';
|
||||||
|
|
||||||
// api
|
// api
|
||||||
import BandoService from '../../../../service/bando-service';
|
import BandoService from '../../../../service/bando-service';
|
||||||
@@ -22,6 +22,7 @@ import ProperBandoLabel from '../../../../components/ProperBandoLabel';
|
|||||||
|
|
||||||
|
|
||||||
const LatestBandiTable = () => {
|
const LatestBandiTable = () => {
|
||||||
|
const chosenCompanyId = useStore().main.chosenCompanyId();
|
||||||
const [items, setItems] = useState(null);
|
const [items, setItems] = useState(null);
|
||||||
const [filters, setFilters] = useState(null);
|
const [filters, setFilters] = useState(null);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
@@ -145,8 +146,9 @@ const LatestBandiTable = () => {
|
|||||||
body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
|
body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
|
||||||
<Column field="status" header={__('Stato', 'gepafin')}
|
<Column field="status" header={__('Stato', 'gepafin')}
|
||||||
style={{ minWidth: '7rem' }} body={statusBodyTemplate} />
|
style={{ minWidth: '7rem' }} body={statusBodyTemplate} />
|
||||||
<Column header={__('Azioni', 'gepafin')}
|
{!isEmpty(chosenCompanyId) && chosenCompanyId !== 0
|
||||||
body={actionsBodyTemplate}/>
|
? <Column header={__('Azioni', 'gepafin')}
|
||||||
|
body={actionsBodyTemplate}/> : null}
|
||||||
</DataTable>
|
</DataTable>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { __ } from '@wordpress/i18n';
|
import { __ } from '@wordpress/i18n';
|
||||||
import { uniq, is } from 'ramda';
|
import { uniq, is, isEmpty } from 'ramda';
|
||||||
|
|
||||||
// tools
|
// tools
|
||||||
import getBandoLabel from '../../../../helpers/getBandoLabel';
|
import getBandoLabel from '../../../../helpers/getBandoLabel';
|
||||||
@@ -36,11 +36,13 @@ const MyLatestSubmissionsTable = () => {
|
|||||||
const [statuses, setStatuses] = useState([]);
|
const [statuses, setStatuses] = useState([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) {
|
||||||
setLocalAsyncRequest(true);
|
setLocalAsyncRequest(true);
|
||||||
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
|
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
|
||||||
['companyId', chosenCompanyId],
|
['companyId', chosenCompanyId],
|
||||||
['statuses', ['DRAFT', 'AWAITING', 'READY']]
|
['statuses', ['DRAFT', 'AWAITING', 'READY']]
|
||||||
])
|
]);
|
||||||
|
}
|
||||||
}, [chosenCompanyId]);
|
}, [chosenCompanyId]);
|
||||||
|
|
||||||
const getApplCallback = (data) => {
|
const getApplCallback = (data) => {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { __ } from '@wordpress/i18n';
|
import { __ } from '@wordpress/i18n';
|
||||||
import { is, uniq } from 'ramda';
|
import { is, isEmpty, uniq } from 'ramda';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
|
|
||||||
// store
|
// store
|
||||||
@@ -36,11 +36,13 @@ const BeneficiarioDomandeTable = () => {
|
|||||||
const [statuses, setStatuses] = useState([]);
|
const [statuses, setStatuses] = useState([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) {
|
||||||
setLocalAsyncRequest(true);
|
setLocalAsyncRequest(true);
|
||||||
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
|
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
|
||||||
['companyId', chosenCompanyId],
|
['companyId', chosenCompanyId],
|
||||||
['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION']]
|
['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION']]
|
||||||
])
|
]);
|
||||||
|
}
|
||||||
}, [chosenCompanyId]);
|
}, [chosenCompanyId]);
|
||||||
|
|
||||||
const getApplCallback = (data) => {
|
const getApplCallback = (data) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user