From 060687eaa18682df367bf0d996d80129e12f8000 Mon Sep 17 00:00:00 2001 From: tlacalv Date: Fri, 18 Dec 2020 08:17:59 -0700 Subject: [PATCH 1/4] Cambio de endpoint --- src/modules/handlers/savePdfHandler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/handlers/savePdfHandler.js b/src/modules/handlers/savePdfHandler.js index 45c8384..71ce900 100644 --- a/src/modules/handlers/savePdfHandler.js +++ b/src/modules/handlers/savePdfHandler.js @@ -83,16 +83,16 @@ const savePdfHandler = (container, store) => { formData.append('pages', pagesArray); formData.append('messages', messageArray); formData.append('id_oficio', inputIdOficio.value); - fetch('http://localhost/SIGTRANS/ajax/pdfupload.ajax.php', { + fetch('http://10.13.1.3/SIGTRANS/ajax/pdfupload.ajax.php', { method: 'POST', body: formData }) .then( response => response.json()) .then(data => { + console.log(data) window.close(); console.log(data.url); window.location.replace(data.url); - console.log('holo') }) .catch(er => console.log(er)); From ddde3f5d157033135f3a1f831fec9923d5fc9fa5 Mon Sep 17 00:00:00 2001 From: tlacalv Date: Wed, 6 Jan 2021 10:32:03 -0700 Subject: [PATCH 2/4] Se formatea el listado de paginas a enviar al servidor --- src/modules/handlers/savePdfHandler.js | 37 ++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/src/modules/handlers/savePdfHandler.js b/src/modules/handlers/savePdfHandler.js index 71ce900..26e2ead 100644 --- a/src/modules/handlers/savePdfHandler.js +++ b/src/modules/handlers/savePdfHandler.js @@ -70,7 +70,7 @@ const savePdfHandler = (container, store) => { state.forEach( page => { - pagesArray.push(page.numPage) + pagesArray.push(parseInt(page.numPage)) page.rectangles.forEach( rectangle => { if(!messageArray.includes(rectangle.text.replace(/,/gi,'-'))) { @@ -80,19 +80,46 @@ const savePdfHandler = (container, store) => { ) } ) - formData.append('pages', pagesArray); + + //loop + let start = 0; + let string=[] + for(let i=0;i response.json()) + .then( response => { + console.log('primera respuesta') + return response.text() + }) .then(data => { console.log(data) window.close(); console.log(data.url); - window.location.replace(data.url); + // window.location.replace(data.url); }) .catch(er => console.log(er)); From 5d817e55cd8e46ca6d5161ad304f3f4a2b490c77 Mon Sep 17 00:00:00 2001 From: tlacalv Date: Thu, 14 Jan 2021 10:37:15 -0700 Subject: [PATCH 3/4] Se arregla el enviado al servidor --- src/modules/handlers/savePdfHandler.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/modules/handlers/savePdfHandler.js b/src/modules/handlers/savePdfHandler.js index 26e2ead..6cf30df 100644 --- a/src/modules/handlers/savePdfHandler.js +++ b/src/modules/handlers/savePdfHandler.js @@ -116,10 +116,15 @@ const savePdfHandler = (container, store) => { return response.text() }) .then(data => { - console.log(data) - window.close(); - console.log(data.url); - // window.location.replace(data.url); + try{ + let json = JSON.parse(data) + window.close(); + console.log(json.url); + window.location.replace(json.url); + } catch(e) { + console.log(data) + } + }) .catch(er => console.log(er)); From 71704bc1fd96a41fa6cb03adf562f670d027d3f8 Mon Sep 17 00:00:00 2001 From: Tlacaelel Leon Date: Mon, 3 Jan 2022 10:28:29 -0700 Subject: [PATCH 4/4] changed server ip --- public/index.php | 2 + src/modules/dom/elements.js | 2 + src/modules/handlers/savePdfHandler.js | 209 +++++++++++++++---------- 3 files changed, 129 insertions(+), 84 deletions(-) diff --git a/public/index.php b/public/index.php index f974fff..0b729ff 100644 --- a/public/index.php +++ b/public/index.php @@ -1,6 +1,8 @@ '; + echo ''; ?> diff --git a/src/modules/dom/elements.js b/src/modules/dom/elements.js index 024726a..f3a9884 100644 --- a/src/modules/dom/elements.js +++ b/src/modules/dom/elements.js @@ -5,8 +5,10 @@ const clearButton = document.getElementById('clear'); const clearStateButton = document.getElementById('clear-state'); const saveButton = document.getElementById('save'); const inputIdOficio = document.getElementById('id_oficio'); +const inputDBTable = document.getElementById('db_table'); export { + inputDBTable, inputIdOficio, saveButton, clearStateButton, diff --git a/src/modules/handlers/savePdfHandler.js b/src/modules/handlers/savePdfHandler.js index 6cf30df..e1e4c50 100644 --- a/src/modules/handlers/savePdfHandler.js +++ b/src/modules/handlers/savePdfHandler.js @@ -1,23 +1,21 @@ -import jsPDF from 'jspdf'; -import { inputIdOficio } from '../dom/elements'; +import jsPDF from "jspdf"; +import { inputIdOficio, inputDBTable } from "../dom/elements"; const savePdfHandler = (container, store) => { - if (container.children.length > 0) { let state = store.getState(); - - //integra con el estado para solo unir las imagenes dibujadas /// + //integra con el estado para solo unir las imagenes dibujadas /// let pages = container.children; - let doc = new jsPDF('p', 'pt', 'letter', true, true); - let pdfName = 'sample.pdf'; + let doc = new jsPDF("p", "pt", "letter", true, true); + let pdfName = "sample.pdf"; //preparacion pdf - let tempCanvas = document.createElement('canvas'); + let tempCanvas = document.createElement("canvas"); let tempContext = tempCanvas.getContext("2d"); - + console.time("loop"); - for (let i = 0; i < pages.length; i++){ + for (let i = 0; i < pages.length; i++) { //page let imagePDF = pages[i].children[0]; //draw @@ -26,112 +24,155 @@ const savePdfHandler = (container, store) => { let height = doc.internal.pageSize.getHeight(); let isDrawn = false; - - tempCanvas.width=Math.floor((imagePDF.width)/1.3); - tempCanvas.height=Math.floor((imagePDF.height)/1.3); + tempCanvas.width = Math.floor(imagePDF.width / 1.3); + tempCanvas.height = Math.floor(imagePDF.height / 1.3); state.forEach((page) => { if (page.idPage === imageCanvas.id) { isDrawn = true; } - }) + }); - if(isDrawn) { - tempContext.drawImage(imagePDF, 0, 0, imagePDF.width, imagePDF.height, 0, 0, tempCanvas.width, tempCanvas.height); - tempContext.drawImage(imageCanvas,0, 0, imageCanvas.width, imageCanvas.height, 0, 0, tempCanvas.width, tempCanvas.height); - - doc.addImage(tempCanvas.toDataURL("image/jpeg",0.3),'JPG',0,0,width,height,undefined,'SLOW'); - }else { - tempContext.drawImage(imagePDF, 0, 0, imagePDF.width, imagePDF.height, 0, 0, tempCanvas.width, tempCanvas.height); - doc.addImage(tempCanvas.toDataURL("image/jpeg",0.3),'JPG',0,0,width,height,undefined,'SLOW'); + if (isDrawn) { + tempContext.drawImage( + imagePDF, + 0, + 0, + imagePDF.width, + imagePDF.height, + 0, + 0, + tempCanvas.width, + tempCanvas.height + ); + tempContext.drawImage( + imageCanvas, + 0, + 0, + imageCanvas.width, + imageCanvas.height, + 0, + 0, + tempCanvas.width, + tempCanvas.height + ); + doc.addImage( + tempCanvas.toDataURL("image/jpeg", 0.3), + "JPG", + 0, + 0, + width, + height, + undefined, + "SLOW" + ); + } else { + tempContext.drawImage( + imagePDF, + 0, + 0, + imagePDF.width, + imagePDF.height, + 0, + 0, + tempCanvas.width, + tempCanvas.height + ); + doc.addImage( + tempCanvas.toDataURL("image/jpeg", 0.3), + "JPG", + 0, + 0, + width, + height, + undefined, + "SLOW" + ); } - if(i+1 !== pages.length) { + if (i + 1 !== pages.length) { doc.addPage(); } } console.timeEnd("loop"); - + //API CALL // doc.save('d'); - let blob = doc.output('blob'); + let blob = doc.output("blob"); let size = (bytes) => { - return bytes/1024/1024 - } - console.log('MB', size(blob.size)); + return bytes / 1024 / 1024; + }; + console.log("MB", size(blob.size)); let formData = new FormData(); - formData.append('pdf', blob); - + formData.append("pdf", blob); //revisamos el estado para sacar la informacion y enviarla al servidor - let pagesArray = [], messageArray = [] + let pagesArray = [], + messageArray = []; + + state.forEach((page) => { + pagesArray.push(parseInt(page.numPage)); + page.rectangles.forEach((rectangle) => { + if (!messageArray.includes(rectangle.text.replace(/,/gi, "-"))) { + messageArray.push(rectangle.text.replace(/,/gi, "-")); + } + }); + }); - state.forEach( - page => { - pagesArray.push(parseInt(page.numPage)) - page.rectangles.forEach( - rectangle => { - if(!messageArray.includes(rectangle.text.replace(/,/gi,'-'))) { - messageArray.push(rectangle.text.replace(/,/gi,'-')) - } - } - ) - } - ) - //loop let start = 0; - let string=[] - for(let i=0;i { - console.log('primera respuesta') - return response.text() - }) - .then(data => { - try{ - let json = JSON.parse(data) - window.close(); - console.log(json.url); - window.location.replace(json.url); - } catch(e) { - console.log(data) - } - + formData.append("pages", string); + formData.append("messages", messageArray); + formData.append("id_oficio", inputIdOficio.value); + formData.append("db_table", inputDBTable.value); + fetch("http://10.13.1.3/SIGTRANS/ajax/pdfupload.ajax.php", { + method: "POST", + body: formData, }) - .catch(er => console.log(er)); - - - - + .then((response) => { + console.log("primera respuesta"); + return response.text(); + }) + .then((data) => { + try { + let json = JSON.parse(data); + window.close(); + console.log(json.url); + window.location.replace(json.url); + } catch (e) { + console.log(data); + } + }) + .catch((er) => console.log(er)); } -} +}; export default savePdfHandler;