From 83a0a9b08fec6554b9e81ad405b77fcbc820742b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 28 May 2020 15:33:24 +0200 Subject: [PATCH] Fixed minor bug --- .classpath | 6 +- .settings/org.eclipse.wst.common.component | 2 +- .../CorrelationAnnualPanelResult.java | 7 +- .../SynopticTableAnnualPanelResult.java | 98 +++++++++-------- .../viewbinder/CorrelationPanelResult.java | 7 +- .../viewbinder/SynopticTablePanelResult.java | 100 ++++++++++-------- 6 files changed, 121 insertions(+), 99 deletions(-) diff --git a/.classpath b/.classpath index 0aec32c..75ffa1a 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -35,5 +35,5 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 076f017..b7ec63c 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/CorrelationAnnualPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/CorrelationAnnualPanelResult.java index ed11fd4..a049033 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/CorrelationAnnualPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/CorrelationAnnualPanelResult.java @@ -237,7 +237,7 @@ public class CorrelationAnnualPanelResult extends Composite { public void addParameters(String keyToGet, Map> parameters, String toShowBatchTypeValue) { final FlexTable flexTable = new FlexTable(); - flexTable.getElement().setId("CorrelationParameterInputKPIs"); + flexTable.getElement().setId("CorrelationAnnualParameterInputKPIs_"+requestId); flexTable.setStyleName("colgrouptable"); try { @@ -617,7 +617,7 @@ public class CorrelationAnnualPanelResult extends Composite { yPos += 4; var correlationParametersInputKPIs = $doc - .getElementById('CorrelationParameterInputKPIs'); + .getElementById('CorrelationAnnualParameterInputKPIs_'+requestId); console.log('InputKPIs: ' + correlationParametersInputKPIs); @@ -631,6 +631,9 @@ public class CorrelationAnnualPanelResult extends Composite { fillColor : [ 211, 225, 241 ] } }, + bodyStyles : { + minCellWidth: 20 + }, html : correlationParametersInputKPIs }); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SynopticTableAnnualPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SynopticTableAnnualPanelResult.java index f8a6737..646f523 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SynopticTableAnnualPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SynopticTableAnnualPanelResult.java @@ -77,7 +77,7 @@ public class SynopticTableAnnualPanelResult { } }); savePDFButton.setVisible(false); - + res.add(savePDFButton); submitRequestPanel.addWidget(res); @@ -212,13 +212,13 @@ public class SynopticTableAnnualPanelResult { container.add(alert); return; } - + savePDFButton.setVisible(true); final String toTitle = title; outputNumber = 1; - + for (OutputFile outputFile : dmResponse.getListOutput()) { final FileContentType fileContentType = outputFile.getDataType(); @@ -424,51 +424,58 @@ public class SynopticTableAnnualPanelResult { var checkColor = function(data) { if (data.section === 'body') { console.log(data); - var good = '
'; - var normal = '
'; - var bad = '
'; if (typeof data.cell !== 'undefined' && data.cell !== null) { if (typeof data.cell.raw !== 'undefined' && data.cell.raw !== null) { - console.log(data.cell.raw.innerHTML); - if (data.cell.raw.innerHTML === good) { + + var good = 'background-color: limegreen;'; + var normal = 'background-color: yellow;'; + var bad = 'background-color: red;'; + + if (data.cell.raw.innerHTML + .indexOf(good) >= 0) { console.log('good'); - var posIW = (data.cell.x + (data.cell.width / 2)-2); - var posIH = (data.cell.y + (data.cell.height / 2)-2); - var greenImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAWAQEBAQAAAAAAAAAAAAAAAAAACAn/2gAMAwEAAhADEAAAAbSM8+wB/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABBQIf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAwEBPwEf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAgEBPwEf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQAGPwIf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABPyEf/9oADAMBAAIAAwAAABAAD//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQMBAT8QH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQIBAT8QH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAT8QH//Z' - pdoc.addImage(greenImg, 'JPEG', posIW, posIH, 4, 4); - //pdoc.setFontSize(10); - //pdoc.setFontType("normal"); - //var posW = (data.cell.x + (data.cell.width / 2)); - //var posH = (data.cell.y + (data.cell.height / 2)); - //pdoc.text('G', posW, posH,'center'); + data.cell.styles.fillColor = [ 50, + 205, 50 ]; + + //var posIW = (data.cell.x + // + (data.cell.width / 2) - 2); + //var posIH = (data.cell.y + // + (data.cell.height / 2) - 2); + //var greenImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAWAQEBAQAAAAAAAAAAAAAAAAAACAn/2gAMAwEAAhADEAAAAbSM8+wB/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABBQIf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAwEBPwEf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAgEBPwEf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQAGPwIf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABPyEf/9oADAMBAAIAAwAAABAAD//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQMBAT8QH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQIBAT8QH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAT8QH//Z' + //pdoc.addImage(greenImg, 'JPEG', + // posIW, posIH, 4, 4); } else { - if (data.cell.raw.innerHTML === normal) { + if (data.cell.raw.innerHTML + .indexOf(normal) >= 0) { console.log('normal'); - var posIW = (data.cell.x + (data.cell.width / 2)-2); - var posIH = (data.cell.y + (data.cell.height / 2)-2); - var yellowImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAn/xAAWAQEBAQAAAAAAAAAAAAAAAAAABwr/2gAMAwEAAhADEAAAAbEZ/wCqAD//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAEFAh//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/AR//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/AR//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAY/Ah//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAE/IR//2gAMAwEAAgADAAAAEAAP/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAwEBPxAf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAgEBPxAf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABPxAf/9k=' - pdoc.addImage(yellowImg, 'JPEG', posIW, posIH, 4, 4); - //pdoc.setFontSize(10); - //pdoc.setFontType("normal"); - //var posW = (data.cell.x + (data.cell.width / 2)); - //var posH = (data.cell.y + (data.cell.height / 2)); - //pdoc.text('N', posW, posH,'center'); + data.cell.styles.fillColor = [ + 255, 255, 0 ]; + //var posIW = (data.cell.x + // + (data.cell.width / 2) - 2); + //var posIH = (data.cell.y + // + (data.cell.height / 2) - 2); + //var yellowImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAn/xAAWAQEBAQAAAAAAAAAAAAAAAAAABwr/2gAMAwEAAhADEAAAAbEZ/wCqAD//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAEFAh//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/AR//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/AR//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAY/Ah//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAE/IR//2gAMAwEAAgADAAAAEAAP/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAwEBPxAf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAgEBPxAf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABPxAf/9k=' + //pdoc.addImage(yellowImg, + // 'JPEG', posIW, posIH, + // 4, 4); } else { - if (data.cell.raw.innerHTML === bad) { + if (data.cell.raw.innerHTML + .indexOf(bad) >= 0) { console.log('bad'); - var posIW = (data.cell.x + (data.cell.width / 2)-2); - var posIH = (data.cell.y + (data.cell.height / 2)-2); - var redImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAj/xAAWAQEBAQAAAAAAAAAAAAAAAAAACAn/2gAMAwEAAhADEAAAAYvlPfwAf//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAQUCH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQMBAT8BH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQIBAT8BH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEABj8CH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAT8hH//aAAwDAQACAAMAAAAQAA//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/EB//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/EB//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAE/EB//2Q==' - pdoc.addImage(redImg, 'JPEG', posIW, posIH, 4, 4); - //pdoc.setFontSize(10); - //pdoc.setFontType("normal"); - //var posW = (data.cell.x + (data.cell.width / 2)); - //var posH = (data.cell.y + (data.cell.height / 2)); - //pdoc.text('B', posW, posH,'center'); + data.cell.styles.fillColor = [ + 255, 0, 0 ]; + //var posIW = (data.cell.x + // + (data.cell.width / 2) - 2); + //var posIH = (data.cell.y + // + (data.cell.height / 2) - 2); + //var redImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAj/xAAWAQEBAQAAAAAAAAAAAAAAAAAACAn/2gAMAwEAAhADEAAAAYvlPfwAf//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAQUCH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQMBAT8BH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQIBAT8BH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEABj8CH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAT8hH//aAAwDAQACAAMAAAAQAA//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/EB//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/EB//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAE/EB//2Q==' + //pdoc.addImage(redImg, + // 'JPEG', posIW, + // posIH, 4, 4); } else { } @@ -489,7 +496,8 @@ public class SynopticTableAnnualPanelResult { bodyStyles : { fontSize : 9 }, - didDrawCell : checkColor, + //didDrawCell : checkColor, + didParseCell : checkColor, html : secondTable }); @@ -529,15 +537,15 @@ public class SynopticTableAnnualPanelResult { console.log('Result Type is undefined:' + i); } - } + if (j == outputNumber) { - if (i == outputNumber) { - - } else { - if (pdfHeightInMM - yPos < pdfHeightInMM / 6) { - pdoc.addPage(); - yPos = tMargin; // Restart position + } else { + if (pdfHeightInMM - yPos < pdfHeightInMM / 7) { + pdoc.addPage(); + yPos = tMargin; // Restart position + } } + } } diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/CorrelationPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/CorrelationPanelResult.java index af0380d..1e377c3 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/CorrelationPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/CorrelationPanelResult.java @@ -244,7 +244,7 @@ public class CorrelationPanelResult extends Composite { public void addParameters(String keyToGet, Map> parameters, String toShowBatchTypeValue) { final FlexTable flexTable = new FlexTable(); - flexTable.getElement().setId("CorrelationParameterInputKPIs"); + flexTable.getElement().setId("CorrelationParameterInputKPIs_"+requestId); flexTable.setStyleName("colgrouptable"); try { @@ -634,7 +634,7 @@ public class CorrelationPanelResult extends Composite { yPos += 4; var correlationParametersInputKPIs = $doc - .getElementById('CorrelationParameterInputKPIs'); + .getElementById('CorrelationParameterInputKPIs_'+requestId); console.log('InputKPIs: ' + correlationParametersInputKPIs); @@ -648,6 +648,9 @@ public class CorrelationPanelResult extends Composite { fillColor : [ 211, 225, 241 ] } }, + bodyStyles : { + minCellWidth: 20 + }, html : correlationParametersInputKPIs }); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SynopticTablePanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SynopticTablePanelResult.java index e3d34c6..bbf4831 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SynopticTablePanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SynopticTablePanelResult.java @@ -107,7 +107,7 @@ public class SynopticTablePanelResult { PerformFishResources.INSTANCE.synopticTable().getText(), submitRequestPanel); HorizontalPanel res = new HorizontalPanel(); - savePDFButton = new Button(); + savePDFButton = new Button(); savePDFButton.getElement().getStyle().setMargin(10, Unit.PX); savePDFButton.setIcon(IconType.PRINT); savePDFButton.addClickHandler(new ClickHandler() { @@ -208,9 +208,9 @@ public class SynopticTablePanelResult { } savePDFButton.setVisible(true); - + final String toTitle = title; - + outputNumber = 1; for (OutputFile outputFile : dmResponse.getListOutput()) { @@ -376,7 +376,7 @@ public class SynopticTablePanelResult { //pdoc.text("Analysis:", xPos, yPos, 'left'); yPos += 6; - for (var i = 1; i <= outputIteration; i++) { + for (var i = 1; i <= outputIteration; i++) { for (var j = 1; j <= outputNumber; j++) { @@ -419,51 +419,58 @@ public class SynopticTablePanelResult { var checkColor = function(data) { if (data.section === 'body') { console.log(data); - var good = '
'; - var normal = '
'; - var bad = '
'; if (typeof data.cell !== 'undefined' && data.cell !== null) { if (typeof data.cell.raw !== 'undefined' && data.cell.raw !== null) { - console.log(data.cell.raw.innerHTML); - if (data.cell.raw.innerHTML === good) { + + var good = 'background-color: limegreen;'; + var normal = 'background-color: yellow;'; + var bad = 'background-color: red;'; + + if (data.cell.raw.innerHTML + .indexOf(good) >= 0) { console.log('good'); - var posIW = (data.cell.x + (data.cell.width / 2)-2); - var posIH = (data.cell.y + (data.cell.height / 2)-2); - var greenImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAWAQEBAQAAAAAAAAAAAAAAAAAACAn/2gAMAwEAAhADEAAAAbSM8+wB/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABBQIf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAwEBPwEf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAgEBPwEf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQAGPwIf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABPyEf/9oADAMBAAIAAwAAABAAD//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQMBAT8QH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQIBAT8QH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAT8QH//Z' - pdoc.addImage(greenImg, 'JPEG', posIW, posIH, 4, 4); - //pdoc.setFontSize(10); - //pdoc.setFontType("normal"); - //var posW = (data.cell.x + (data.cell.width / 2)); - //var posH = (data.cell.y + (data.cell.height / 2)); - //pdoc.text('G', posW, posH,'center'); + data.cell.styles.fillColor = [ 50, + 205, 50 ]; + + //var posIW = (data.cell.x + // + (data.cell.width / 2) - 2); + //var posIH = (data.cell.y + // + (data.cell.height / 2) - 2); + //var greenImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAWAQEBAQAAAAAAAAAAAAAAAAAACAn/2gAMAwEAAhADEAAAAbSM8+wB/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABBQIf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAwEBPwEf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAgEBPwEf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQAGPwIf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABPyEf/9oADAMBAAIAAwAAABAAD//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQMBAT8QH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQIBAT8QH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAT8QH//Z' + //pdoc.addImage(greenImg, 'JPEG', + // posIW, posIH, 4, 4); } else { - if (data.cell.raw.innerHTML === normal) { + if (data.cell.raw.innerHTML + .indexOf(normal) >= 0) { console.log('normal'); - var posIW = (data.cell.x + (data.cell.width / 2)-2); - var posIH = (data.cell.y + (data.cell.height / 2)-2); - var yellowImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAn/xAAWAQEBAQAAAAAAAAAAAAAAAAAABwr/2gAMAwEAAhADEAAAAbEZ/wCqAD//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAEFAh//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/AR//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/AR//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAY/Ah//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAE/IR//2gAMAwEAAgADAAAAEAAP/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAwEBPxAf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAgEBPxAf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABPxAf/9k=' - pdoc.addImage(yellowImg, 'JPEG', posIW, posIH, 4, 4); - //pdoc.setFontSize(10); - //pdoc.setFontType("normal"); - //var posW = (data.cell.x + (data.cell.width / 2)); - //var posH = (data.cell.y + (data.cell.height / 2)); - //pdoc.text('N', posW, posH,'center'); + data.cell.styles.fillColor = [ + 255, 255, 0 ]; + //var posIW = (data.cell.x + // + (data.cell.width / 2) - 2); + //var posIH = (data.cell.y + // + (data.cell.height / 2) - 2); + //var yellowImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAn/xAAWAQEBAQAAAAAAAAAAAAAAAAAABwr/2gAMAwEAAhADEAAAAbEZ/wCqAD//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAEFAh//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/AR//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/AR//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAY/Ah//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAE/IR//2gAMAwEAAgADAAAAEAAP/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAwEBPxAf/8QAFBEBAAAAAAAAAAAAAAAAAAAAIP/aAAgBAgEBPxAf/8QAFBABAAAAAAAAAAAAAAAAAAAAIP/aAAgBAQABPxAf/9k=' + //pdoc.addImage(yellowImg, + // 'JPEG', posIW, posIH, + // 4, 4); } else { - if (data.cell.raw.innerHTML === bad) { + if (data.cell.raw.innerHTML + .indexOf(bad) >= 0) { console.log('bad'); - var posIW = (data.cell.x + (data.cell.width / 2)-2); - var posIH = (data.cell.y + (data.cell.height / 2)-2); - var redImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAj/xAAWAQEBAQAAAAAAAAAAAAAAAAAACAn/2gAMAwEAAhADEAAAAYvlPfwAf//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAQUCH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQMBAT8BH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQIBAT8BH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEABj8CH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAT8hH//aAAwDAQACAAMAAAAQAA//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/EB//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/EB//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAE/EB//2Q==' - pdoc.addImage(redImg, 'JPEG', posIW, posIH, 4, 4); - //pdoc.setFontSize(10); - //pdoc.setFontType("normal"); - //var posW = (data.cell.x + (data.cell.width / 2)); - //var posH = (data.cell.y + (data.cell.height / 2)); - //pdoc.text('B', posW, posH,'center'); + data.cell.styles.fillColor = [ + 255, 0, 0 ]; + //var posIW = (data.cell.x + // + (data.cell.width / 2) - 2); + //var posIH = (data.cell.y + // + (data.cell.height / 2) - 2); + //var redImg = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAAKAAoDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAj/xAAWAQEBAQAAAAAAAAAAAAAAAAAACAn/2gAMAwEAAhADEAAAAYvlPfwAf//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAQUCH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQMBAT8BH//EABQRAQAAAAAAAAAAAAAAAAAAACD/2gAIAQIBAT8BH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEABj8CH//EABQQAQAAAAAAAAAAAAAAAAAAACD/2gAIAQEAAT8hH//aAAwDAQACAAMAAAAQAA//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAEDAQE/EB//xAAUEQEAAAAAAAAAAAAAAAAAAAAg/9oACAECAQE/EB//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAE/EB//2Q==' + //pdoc.addImage(redImg, + // 'JPEG', posIW, + // posIH, 4, 4); } else { } @@ -484,7 +491,8 @@ public class SynopticTablePanelResult { bodyStyles : { fontSize : 9 }, - didDrawCell : checkColor, + //didDrawCell : checkColor, + didParseCell : checkColor, html : secondTable }); @@ -524,15 +532,15 @@ public class SynopticTablePanelResult { console.log('Result Type is undefined:' + i); } - } + if (j == outputNumber) { - if (i == outputNumber) { - - } else { - if (pdfHeightInMM - yPos < pdfHeightInMM / 6) { - pdoc.addPage(); - yPos = tMargin; // Restart position + } else { + if (pdfHeightInMM - yPos < pdfHeightInMM / 7) { + pdoc.addPage(); + yPos = tMargin; // Restart position + } } + } }