diff --git a/app/api/uploadSignature.json b/app/api/uploadSignature.json index 6976a18..e797a20 100644 --- a/app/api/uploadSignature.json +++ b/app/api/uploadSignature.json @@ -17,8 +17,7 @@ "value": "{{$_POST.imageData.replace(/^data:image\\/\\w+;base64,/, \"\")}}" }, "meta": [], - "outputType": "text", - "output": true + "outputType": "text" }, { "name": "saveSignatureBinary", @@ -26,7 +25,8 @@ "action": "upload", "options": { "fields": "{{decodedImage}}", - "path": "/public/signatures/Sig_{{NOW.timestamp}}.png" + "path": "/", + "template": "{guid}" }, "meta": [ { diff --git a/public/PDF/dummyFunctions.js b/public/PDF/dummyFunctions.js index 9ae3db9..b7e275e 100644 --- a/public/PDF/dummyFunctions.js +++ b/public/PDF/dummyFunctions.js @@ -22,6 +22,30 @@ async function toBase64(filePath) { } +function saveSignatureTEST1() { + // Capture the Base64 image data from the canvas + const canvas = document.getElementById('signatureCanvas'); + const imageData = canvas.toDataURL('image/png'); // Base64-encoded image + + // Use Wappler's Server Connect to send a POST request + dmx.parse('serverconnect_sign.load({imageData: "' + imageData + '"})'); + console.log("SSTEST: Finish Run, Anything happen?") +} + + +function saveSignatureTEST2() { + const canvas = document.getElementById('signatureCanvas'); + const imageData = canvas.toDataURL('image/png'); // Convert the canvas to a Base64 image string + + dmx.parse('serverconnect_sign.load({image: "' + imageData + '"})').then((response) => { + const uploadedSignature = document.getElementById('uploadedSignature'); + uploadedSignature.src = response.fileUrl; // Set the uploaded file URL to the image element + }).catch((error) => { + console.error("Error uploading signature:", error); + }); +} + + /** const terminal = document.getElementById('terminal'); diff --git a/public/PDF/libPDFscripts.js b/public/PDF/libPDFscripts.js index b4435dd..ac16de1 100644 --- a/public/PDF/libPDFscripts.js +++ b/public/PDF/libPDFscripts.js @@ -1,8 +1,15 @@ // JavaScript Document +console.log("LIBRARY: libPDFscripts.js") //Use this function as a start - to pass the path, then datasource to update with pdfbytes, then download -- Maybe combine into one file? //wich is more efficient? +let popover = new bootstrap.Popover(popoverTrigger, { + content: "This dropdown is disabled.", + placement: "top", + trigger: "manual" +}); + //filepath = /PDF/XXX.pdf, dataSource = datastore.var // *** Use of 'rest paramater' syntax to add extra datasources at the end. //return array of datasources i.e [datastore,data_view1] and pass that array to updatePdfFields @@ -99,3 +106,5 @@ function generateRandomFilename() { console.log("Random Filename: ", filename); return filename; } + + diff --git a/public/dmxAppConnect/config.js b/public/dmxAppConnect/config.js index f9413f1..6e50e2a 100644 --- a/public/dmxAppConnect/config.js +++ b/public/dmxAppConnect/config.js @@ -65,16 +65,6 @@ dmx.config({ ] }, "index": { - "global": [ - { - "type": "text", - "name": "file" - }, - { - "type": "text", - "name": "imageData" - } - ], "flowRunPageId": { "meta": [ { diff --git a/public/js/libProcessScript.js b/public/js/libProcessScript.js index 0bebd83..be4f430 100644 --- a/public/js/libProcessScript.js +++ b/public/js/libProcessScript.js @@ -143,7 +143,8 @@ function saveSignature() { const imageData = canvas.toDataURL('image/png'); dd(imageData.length) // Trigger the server action and handle the response - dmx.parse('serverconnect_sign.load({ image: imageData })'); + dmx.parse('serverconnect_sign.load({imageData: "' + imageData + '"})'); + //dmx.parse('serverconnect_sign.load({ image: imageData })'); /** dmx.parse('serverconnect_sign.load', { image: imageData }).then((response) => { //dmx.parse('serverconnect_sign.load({image: "' + imageData + '"})').then((response) => { diff --git a/views/index0.ejs b/views/index0.ejs index 19e6fe6..ad46675 100644 --- a/views/index0.ejs +++ b/views/index0.ejs @@ -12,7 +12,7 @@ alert: {message: "{{saveSignatureFlow}}"} } ] - +