BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed disabling uploading signed appl pdf;

Browse Source
This commit is contained in:
Vitalii Kiiko
2024-10-29 11:29:49 +01:00
parent 75e0871cf1
commit c8e199eb4f
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pages/BandoApplication/index.js
View File

@@ -4,7 +4,7 @@ import { useParams } from 'react-router-dom';
import { head, is, pluck, isEmpty, pathOr } from 'ramda'; import { head, is, pluck, isEmpty, pathOr } from 'ramda';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import { TZDate } from '@date-fns/tz'; import { TZDate } from '@date-fns/tz';
import "quill/dist/quill.core.css"; import 'quill/dist/quill.core.css';
// store // store
import { storeSet, storeGet, useStore } from '../../store'; import { storeSet, storeGet, useStore } from '../../store';
@@ -160,6 +160,7 @@ const BandoApplication = () => {
const validateApplicationCallback = (data) => { const validateApplicationCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
console.log('data.data', data.data)
if (data.data.status) { if (data.data.status) {
setApplicationStatus(data.data.status); // ask why not 'applicationStatus'? setApplicationStatus(data.data.status); // ask why not 'applicationStatus'?
} }
@@ -447,11 +448,10 @@ const BandoApplication = () => {
const handleSetSignedDocumentFromFileupload = (fieldName, stateFieldData) => { const handleSetSignedDocumentFromFileupload = (fieldName, stateFieldData) => {
setSignedPdfFile(stateFieldData); setSignedPdfFile(stateFieldData);
setApplicationStatus('READY');
/*if (!isEmpty(stateFieldData)) { if (!isEmpty(stateFieldData)) {
setVisibleConfirmation(true); setApplicationStatus('READY');
}*/ }
} }
useEffect(() => { useEffect(() => {
@@ -565,8 +565,10 @@ const BandoApplication = () => {
//console.log('validations', validations, o.name) //console.log('validations', validations, o.name)
return ['paragraph'].includes(o.name) && text return ['paragraph'].includes(o.name) && text
? <div className="appForm__content ql-editor" key={o.id}> ? <div>
{renderHtmlContent(text.value)} <div className="ql-editor" key={o.id}>
{renderHtmlContent(text.value)}
</div>
</div> </div>
: <FormField : <FormField
key={o.id} key={o.id}
@@ -618,7 +620,7 @@ const BandoApplication = () => {
<FileuploadApplicationSignedPdf <FileuploadApplicationSignedPdf
setDataFn={handleSetSignedDocumentFromFileupload} setDataFn={handleSetSignedDocumentFromFileupload}
fieldName="signedPdfFile" fieldName="signedPdfFile"
disabled={'AWAITING' !== applicationStatus} disabled={!isEmpty(signedPdfFile) || 'AWAITING' !== applicationStatus}
defaultValue={is(Array, signedPdfFile) ? signedPdfFile : []} defaultValue={is(Array, signedPdfFile) ? signedPdfFile : []}
accept={['.p7m,application/pkcs7-mime,application/x-pkcs7-mime']} accept={['.p7m,application/pkcs7-mime,application/x-pkcs7-mime']}
chooseLabel={__('Aggiungi documento', 'gepafin')} chooseLabel={__('Aggiungi documento', 'gepafin')}

10
src/pages/BandoFormsPreview/index.js
View File

@@ -4,7 +4,7 @@ import { useNavigate, useParams } from 'react-router-dom';
import { klona } from 'klona'; import { klona } from 'klona';
import { head, isNil } from 'ramda'; import { head, isNil } from 'ramda';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import "quill/dist/quill.core.css"; import 'quill/dist/quill.core.css';
// store // store
import { storeSet, useStore } from '../../store'; import { storeSet, useStore } from '../../store';
@@ -155,9 +155,11 @@ const BandoFormsPreview = () => {
}, {}); }, {});
return ['paragraph'].includes(o.name) && text return ['paragraph'].includes(o.name) && text
? <div className="appForm__content ql-editor" key={o.id}> ? <div>
{renderHtmlContent(text.value)} <div className="ql-editor" key={o.id}>
</div> {renderHtmlContent(text.value)}
</div>
</div>
: <FormField : <FormField
key={o.id} key={o.id}
type={o.name} type={o.name}