update for deal files uploading

This commit is contained in:
merelendor 2023-10-24 16:21:41 +03:00
parent 155f09469d
commit 94cf1d10d3
5 changed files with 15 additions and 7 deletions

View File

@ -292,7 +292,7 @@ export const getDealContracts = ({ dispatch, deal_id }) =>
}); });
} }
export const attachDealDocument = ({ deal_id, document_id, index, lastModified, filename, file, type }) => export const attachDealDocument = ({ deal_id, document_id, document_name, index, lastModified, filename, file, type }) =>
{ {
return new Promise((resolve, reject) => return new Promise((resolve, reject) =>
{ {
@ -302,6 +302,7 @@ export const attachDealDocument = ({ deal_id, document_id, index, lastModified,
const payload = new URLSearchParams({ const payload = new URLSearchParams({
deal_id, deal_id,
document_id, document_id,
document_name,
filename, filename,
index, index,
lastModified, lastModified,

View File

@ -93,10 +93,12 @@ export default class DocumentsForm extends Step
}) })
} }
_handle_onAddFile = (document_id, files, update) => _handle_onAddFile = ({ document_id, document_name, files, update }) =>
{ {
const existed_files = { ...this.state.uploaded }; const existed_files = { ...this.state.uploaded };
console.log({ document_id, document_name, files, update });
console.log("_handle_onAddFile", { existed_files }); console.log("_handle_onAddFile", { existed_files });
const document_files = existed_files[ document_id ] === undefined ? [] : existed_files[ document_id ].files; const document_files = existed_files[ document_id ] === undefined ? [] : existed_files[ document_id ].files;
if(existed_files[ document_id ] === undefined) if(existed_files[ document_id ] === undefined)
@ -125,6 +127,7 @@ export default class DocumentsForm extends Step
// files[nf].index = new_index; // files[nf].index = new_index;
files[nf].group = document_id; files[nf].group = document_id;
files[nf].group_name = document_name;
files[nf].uploaded = false; files[nf].uploaded = false;
files[nf].update = update; files[nf].update = update;
@ -145,6 +148,7 @@ export default class DocumentsForm extends Step
const payload = { const payload = {
deal_id: opp_number, deal_id: opp_number,
document_id: file.group, document_id: file.group,
document_name: file.group_name,
filename: file.name, filename: file.name,
lastModified: file.lastModified, lastModified: file.lastModified,
type: file.type, type: file.type,
@ -346,7 +350,7 @@ export default class DocumentsForm extends Step
statuscode_id={ statuscode_id } statuscode_id={ statuscode_id }
uploading={ uploading } uploading={ uploading }
uploaded={ uploaded[ document.doc_id ] !== undefined ? uploaded[ document.doc_id ] : { files: [] } } uploaded={ uploaded[ document.doc_id ] !== undefined ? uploaded[ document.doc_id ] : { files: [] } }
onAddFile={ (file, update) => { this._handle_onAddFile(document.doc_id, file, update) } } onAddFile={ (files, update) => { this._handle_onAddFile({ document_id: document.doc_id, document_name: document.name, files, update }) } }
onDeleteFile={ this._handle_onDeleteFile } onDeleteFile={ this._handle_onDeleteFile }
document={ document } document={ document }
/> />

View File

@ -133,7 +133,7 @@ export default class SignPlannedContract extends React.Component
<span className="extension">PDF</span> <span className="extension">PDF</span>
</div> </div>
<div className="title"> <div className="title">
<p>{ contract.name } [{ status }]</p> <p>{ contract.name }</p>
<div className="description"> <div className="description">
<span>{ moment(contract.date).format("DD.MM.YYYY") }</span> <span>{ moment(contract.date).format("DD.MM.YYYY") }</span>
<span>{ contract.brand_name }</span> <span>{ contract.brand_name }</span>

View File

@ -34,7 +34,9 @@ export default async function handler(req, res)
upload.single("file")(req, {}, async (err) => upload.single("file")(req, {}, async (err) =>
{ {
const { file, } = req; const { file, } = req;
const { deal_id, document_id, type, index, lastModified, } = req.query; const { deal_id, document_id, document_name, type, index, lastModified, } = req.query;
console.log({ deal_id, document_id, document_name, type, index, lastModified, });
const local_filename = `${ client_jwt_decoded.acc_number }_${ deal_id }_${ document_id }_${ index }`; const local_filename = `${ client_jwt_decoded.acc_number }_${ deal_id }_${ document_id }_${ index }`;
@ -83,6 +85,7 @@ export default async function handler(req, res)
else else
{ {
uploaded[ document_id ] = { uploaded[ document_id ] = {
name: document_name,
files: [ file_payload ], files: [ file_payload ],
} }
} }

View File

@ -160,13 +160,13 @@ export default async function handler(req, res)
eachSeries(Object.keys(deals[ deal_id ].uploaded), (group, callback) => eachSeries(Object.keys(deals[ deal_id ].uploaded), (group, callback) =>
{ {
const document = deals[ deal_id ].uploaded[ group ]; const document = deals[ deal_id ].uploaded[ group ];
console.log({ group, document }); console.log({ group, document, });
if(document.files.length === 1) if(document.files.length === 1)
{ {
const file = document.files[0]; const file = document.files[0];
uploadFile({ deal_id, filename: file.filename, name: file.name, group, crm_jwt }) uploadFile({ deal_id, filename: file.filename, name: document.name, group, crm_jwt })
.then(() => .then(() =>
{ {
callback(); callback();