Compare commits
10 Commits
Feature/17
...
master
Author | SHA1 | Date |
---|---|---|
Giancarlo Panichi | 6a4d266aad | |
Giancarlo Panichi | b05a549b32 | |
Giancarlo Panichi | 1d7cac9f1b | |
Giancarlo Panichi | 352a394c1c | |
Giancarlo Panichi | 11f2124a3e | |
Giancarlo Panichi | 9e5baee0f6 | |
Giancarlo Panichi | 83a0a9b08f | |
Giancarlo Panichi | 5137731dbb | |
Giancarlo Panichi | abced0e5ad | |
Giancarlo Panichi | c18f95a480 |
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="target/performfish-analytics-portlet-0.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
<classpathentry kind="src" output="target/performfish-analytics-portlet-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry excluding="**" kind="src" output="target/performfish-analytics-portlet-0.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
<classpathentry excluding="**" kind="src" output="target/performfish-analytics-portlet-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -35,5 +35,5 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/performfish-analytics-portlet-0.7.0-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/performfish-analytics-portlet-1.0.0-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||||
<wb-module deploy-name="performfish-analytics-portlet-0.7.0-SNAPSHOT">
|
<wb-module deploy-name="performfish-analytics-portlet-1.0.0-SNAPSHOT">
|
||||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
# Changelog
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [v1.0.0] [r4.23.0] - 2020-05-28
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- Added PDF support [#17249]
|
||||||
|
|
||||||
|
|
||||||
|
## [v0.4.0] - 2019-11-07
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- Enabled DEA Analysis [#17252]
|
||||||
|
|
||||||
|
|
||||||
|
## [v0.3.0] - 2019-07-07
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- Add numbers to correlation charts [#17247]
|
||||||
|
- Change Speedometer to Performeter [#17225]
|
||||||
|
- Added synoptic tables for Pre-grow and Hatchery [#17570]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [v0.2.0] - 2019-06-07
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- Release Synoptic table functionality [#17166]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [v0.1.0] - 2019-05-07
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- First Release
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
56
changelog.md
56
changelog.md
|
@ -1,56 +0,0 @@
|
||||||
# Changelog
|
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
|
||||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
||||||
|
|
||||||
|
|
||||||
## [v1.0.0] - 2020-05-28
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
**Features**
|
|
||||||
|
|
||||||
[#17249] Added PDF support
|
|
||||||
|
|
||||||
|
|
||||||
## [v0.4.0] - 2019-11-07
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
**Features**
|
|
||||||
|
|
||||||
[#17252] Enabled DEA Analysis
|
|
||||||
|
|
||||||
|
|
||||||
## [v0.3.0] - 2019-07-07
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
**Features**
|
|
||||||
|
|
||||||
[#17247] Add numbers to correlation charts
|
|
||||||
|
|
||||||
[#17225] Change Speedometer to Performeter
|
|
||||||
|
|
||||||
[#17570] Added synoptic tables for Pre-grow and Hatchery
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [v0.2.0] - 2019-06-07
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
**Features**
|
|
||||||
|
|
||||||
[#17166] Release Synoptic table functionality
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [v0.1.0] - 2019-05-07
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
**Features**
|
|
||||||
|
|
||||||
first release
|
|
||||||
|
|
|
@ -2,28 +2,28 @@
|
||||||
<Changeset
|
<Changeset
|
||||||
component="org.gcube.portlets.user.performfish-analytics-portlet.1-0-0"
|
component="org.gcube.portlets.user.performfish-analytics-portlet.1-0-0"
|
||||||
date="2020-05-28">
|
date="2020-05-28">
|
||||||
<Change>[#17249] Added PDF support</Change>
|
<Change>Added PDF support [#17249]</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset
|
<Changeset
|
||||||
component="org.gcube.portlets.user.performfish-analytics-portlet.0-4-0"
|
component="org.gcube.portlets.user.performfish-analytics-portlet.0-4-0"
|
||||||
date="2019-11-07">
|
date="2019-11-07">
|
||||||
<Change>[#17252] Enabled DEA Analysis</Change>
|
<Change>Enabled DEA Analysis [#17252]</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset
|
<Changeset
|
||||||
component="org.gcube.portlets.user.performfish-analytics-portlet.0-3-0"
|
component="org.gcube.portlets.user.performfish-analytics-portlet.0-3-0"
|
||||||
date="2019-07-07">
|
date="2019-07-07">
|
||||||
<Change>[#17247] Add numbers to correlation charts</Change>
|
<Change>Add numbers to correlation charts [#17247]</Change>
|
||||||
<Change>[#17225] Change Speedometer to Performeter</Change>
|
<Change>Change Speedometer to Performeter [#17225]</Change>
|
||||||
<Change>[#17570] Added synoptic tables for Pre-grow and Hatchery</Change>
|
<Change>Added synoptic tables for Pre-grow and Hatchery [#17570]</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset
|
<Changeset
|
||||||
component="org.gcube.portlets.user.performfish-analytics-portlet.0-2-0"
|
component="org.gcube.portlets.user.performfish-analytics-portlet.0-2-0"
|
||||||
date="2019-06-07">
|
date="2019-06-07">
|
||||||
<Change>[#17166] Release Synoptic table functionality</Change>
|
<Change>Release Synoptic table functionality [#17166]</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset
|
<Changeset
|
||||||
component="org.gcube.portlets.user.performfish-analytics-portlet.0-1-0"
|
component="org.gcube.portlets.user.performfish-analytics-portlet.0-1-0"
|
||||||
date="2019-05-07">
|
date="2019-05-07">
|
||||||
<Change>first release</Change>
|
<Change>First Release</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
</ReleaseNotes>
|
</ReleaseNotes>
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
<includes>
|
<includes>
|
||||||
<include>README.md</include>
|
<include>README.md</include>
|
||||||
<include>LICENSE.md</include>
|
<include>LICENSE.md</include>
|
||||||
|
<include>CHANGELOG.md</include>
|
||||||
<include>profile.xml</include>
|
<include>profile.xml</include>
|
||||||
<include>changelog.xml</include>
|
<include>changelog.xml</include>
|
||||||
</includes>
|
</includes>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -11,7 +11,7 @@
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>performfish-analytics-portlet</artifactId>
|
<artifactId>performfish-analytics-portlet</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0</version>
|
||||||
<name>PerformFish Analytics Portlet</name>
|
<name>PerformFish Analytics Portlet</name>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
|
|
|
@ -237,7 +237,7 @@ public class CorrelationAnnualPanelResult extends Composite {
|
||||||
public void addParameters(String keyToGet, Map<String, List<String>> parameters, String toShowBatchTypeValue) {
|
public void addParameters(String keyToGet, Map<String, List<String>> parameters, String toShowBatchTypeValue) {
|
||||||
|
|
||||||
final FlexTable flexTable = new FlexTable();
|
final FlexTable flexTable = new FlexTable();
|
||||||
flexTable.getElement().setId("CorrelationParameterInputKPIs");
|
flexTable.getElement().setId("CorrelationAnnualParameterInputKPIs_"+requestId);
|
||||||
flexTable.setStyleName("colgrouptable");
|
flexTable.setStyleName("colgrouptable");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -617,7 +617,7 @@ public class CorrelationAnnualPanelResult extends Composite {
|
||||||
yPos += 4;
|
yPos += 4;
|
||||||
|
|
||||||
var correlationParametersInputKPIs = $doc
|
var correlationParametersInputKPIs = $doc
|
||||||
.getElementById('CorrelationParameterInputKPIs');
|
.getElementById('CorrelationAnnualParameterInputKPIs_'+requestId);
|
||||||
|
|
||||||
console.log('InputKPIs: ' + correlationParametersInputKPIs);
|
console.log('InputKPIs: ' + correlationParametersInputKPIs);
|
||||||
|
|
||||||
|
@ -631,6 +631,9 @@ public class CorrelationAnnualPanelResult extends Composite {
|
||||||
fillColor : [ 211, 225, 241 ]
|
fillColor : [ 211, 225, 241 ]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
bodyStyles : {
|
||||||
|
minCellWidth: 20
|
||||||
|
},
|
||||||
html : correlationParametersInputKPIs
|
html : correlationParametersInputKPIs
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -548,7 +548,7 @@ public class SpeedometerAnnualPanelResult {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i == outputNumber) {
|
if (i == outputIteration) {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (pdfHeightInMM - yPos < pdfHeightInMM / 4) {
|
if (pdfHeightInMM - yPos < pdfHeightInMM / 4) {
|
||||||
|
|
|
@ -77,7 +77,7 @@ public class SynopticTableAnnualPanelResult {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
savePDFButton.setVisible(false);
|
savePDFButton.setVisible(false);
|
||||||
|
|
||||||
res.add(savePDFButton);
|
res.add(savePDFButton);
|
||||||
submitRequestPanel.addWidget(res);
|
submitRequestPanel.addWidget(res);
|
||||||
|
|
||||||
|
@ -212,13 +212,13 @@ public class SynopticTableAnnualPanelResult {
|
||||||
container.add(alert);
|
container.add(alert);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
savePDFButton.setVisible(true);
|
savePDFButton.setVisible(true);
|
||||||
|
|
||||||
final String toTitle = title;
|
final String toTitle = title;
|
||||||
|
|
||||||
outputNumber = 1;
|
outputNumber = 1;
|
||||||
|
|
||||||
for (OutputFile outputFile : dmResponse.getListOutput()) {
|
for (OutputFile outputFile : dmResponse.getListOutput()) {
|
||||||
|
|
||||||
final FileContentType fileContentType = outputFile.getDataType();
|
final FileContentType fileContentType = outputFile.getDataType();
|
||||||
|
@ -424,51 +424,58 @@ public class SynopticTableAnnualPanelResult {
|
||||||
var checkColor = function(data) {
|
var checkColor = function(data) {
|
||||||
if (data.section === 'body') {
|
if (data.section === 'body') {
|
||||||
console.log(data);
|
console.log(data);
|
||||||
var good = '<div class="gwt-HTML"><span style="padding-left: 10px; padding-right: 10px; background-color: limegreen; border: 1px solid limegreen;"></span></div>';
|
|
||||||
var normal = '<div class="gwt-HTML"><span style="padding-left: 10px; padding-right: 10px; background-color: yellow; border: 1px solid yellow;"></span></div>';
|
|
||||||
var bad = '<div class="gwt-HTML"><span style="padding-left: 10px; padding-right: 10px; background-color: red;border: 1px solid red;"></span></div>';
|
|
||||||
|
|
||||||
if (typeof data.cell !== 'undefined'
|
if (typeof data.cell !== 'undefined'
|
||||||
&& data.cell !== null) {
|
&& data.cell !== null) {
|
||||||
if (typeof data.cell.raw !== 'undefined'
|
if (typeof data.cell.raw !== 'undefined'
|
||||||
&& data.cell.raw !== null) {
|
&& data.cell.raw !== null) {
|
||||||
|
|
||||||
console.log(data.cell.raw.innerHTML);
|
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');
|
console.log('good');
|
||||||
var posIW = (data.cell.x + (data.cell.width / 2)-2);
|
data.cell.styles.fillColor = [ 50,
|
||||||
var posIH = (data.cell.y + (data.cell.height / 2)-2);
|
205, 50 ];
|
||||||
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);
|
//var posIW = (data.cell.x
|
||||||
//pdoc.setFontSize(10);
|
// + (data.cell.width / 2) - 2);
|
||||||
//pdoc.setFontType("normal");
|
//var posIH = (data.cell.y
|
||||||
//var posW = (data.cell.x + (data.cell.width / 2));
|
// + (data.cell.height / 2) - 2);
|
||||||
//var posH = (data.cell.y + (data.cell.height / 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.text('G', posW, posH,'center');
|
//pdoc.addImage(greenImg, 'JPEG',
|
||||||
|
// posIW, posIH, 4, 4);
|
||||||
} else {
|
} else {
|
||||||
if (data.cell.raw.innerHTML === normal) {
|
if (data.cell.raw.innerHTML
|
||||||
|
.indexOf(normal) >= 0) {
|
||||||
console.log('normal');
|
console.log('normal');
|
||||||
var posIW = (data.cell.x + (data.cell.width / 2)-2);
|
data.cell.styles.fillColor = [
|
||||||
var posIH = (data.cell.y + (data.cell.height / 2)-2);
|
255, 255, 0 ];
|
||||||
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='
|
//var posIW = (data.cell.x
|
||||||
pdoc.addImage(yellowImg, 'JPEG', posIW, posIH, 4, 4);
|
// + (data.cell.width / 2) - 2);
|
||||||
//pdoc.setFontSize(10);
|
//var posIH = (data.cell.y
|
||||||
//pdoc.setFontType("normal");
|
// + (data.cell.height / 2) - 2);
|
||||||
//var posW = (data.cell.x + (data.cell.width / 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='
|
||||||
//var posH = (data.cell.y + (data.cell.height / 2));
|
//pdoc.addImage(yellowImg,
|
||||||
//pdoc.text('N', posW, posH,'center');
|
// 'JPEG', posIW, posIH,
|
||||||
|
// 4, 4);
|
||||||
} else {
|
} else {
|
||||||
if (data.cell.raw.innerHTML === bad) {
|
if (data.cell.raw.innerHTML
|
||||||
|
.indexOf(bad) >= 0) {
|
||||||
console.log('bad');
|
console.log('bad');
|
||||||
var posIW = (data.cell.x + (data.cell.width / 2)-2);
|
data.cell.styles.fillColor = [
|
||||||
var posIH = (data.cell.y + (data.cell.height / 2)-2);
|
255, 0, 0 ];
|
||||||
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=='
|
//var posIW = (data.cell.x
|
||||||
pdoc.addImage(redImg, 'JPEG', posIW, posIH, 4, 4);
|
// + (data.cell.width / 2) - 2);
|
||||||
//pdoc.setFontSize(10);
|
//var posIH = (data.cell.y
|
||||||
//pdoc.setFontType("normal");
|
// + (data.cell.height / 2) - 2);
|
||||||
//var posW = (data.cell.x + (data.cell.width / 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=='
|
||||||
//var posH = (data.cell.y + (data.cell.height / 2));
|
//pdoc.addImage(redImg,
|
||||||
//pdoc.text('B', posW, posH,'center');
|
// 'JPEG', posIW,
|
||||||
|
// posIH, 4, 4);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -487,9 +494,11 @@ public class SynopticTableAnnualPanelResult {
|
||||||
startY : yPos,
|
startY : yPos,
|
||||||
pageBreak : 'auto',
|
pageBreak : 'auto',
|
||||||
bodyStyles : {
|
bodyStyles : {
|
||||||
fontSize : 9
|
fontSize : 6,
|
||||||
|
minCellWidth : 11
|
||||||
},
|
},
|
||||||
didDrawCell : checkColor,
|
//didDrawCell : checkColor,
|
||||||
|
didParseCell : checkColor,
|
||||||
html : secondTable
|
html : secondTable
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -529,15 +538,15 @@ public class SynopticTableAnnualPanelResult {
|
||||||
console.log('Result Type is undefined:' + i);
|
console.log('Result Type is undefined:' + i);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
if (j == outputNumber) {
|
||||||
|
|
||||||
if (i == outputNumber) {
|
} else {
|
||||||
|
if (pdfHeightInMM - yPos < pdfHeightInMM / 7) {
|
||||||
} else {
|
pdoc.addPage();
|
||||||
if (pdfHeightInMM - yPos < pdfHeightInMM / 7) {
|
yPos = tMargin; // Restart position
|
||||||
pdoc.addPage();
|
}
|
||||||
yPos = tMargin; // Restart position
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -244,7 +244,7 @@ public class CorrelationPanelResult extends Composite {
|
||||||
public void addParameters(String keyToGet, Map<String, List<String>> parameters, String toShowBatchTypeValue) {
|
public void addParameters(String keyToGet, Map<String, List<String>> parameters, String toShowBatchTypeValue) {
|
||||||
|
|
||||||
final FlexTable flexTable = new FlexTable();
|
final FlexTable flexTable = new FlexTable();
|
||||||
flexTable.getElement().setId("CorrelationParameterInputKPIs");
|
flexTable.getElement().setId("CorrelationParameterInputKPIs_"+requestId);
|
||||||
flexTable.setStyleName("colgrouptable");
|
flexTable.setStyleName("colgrouptable");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -301,11 +301,12 @@ public class CorrelationPanelResult extends Composite {
|
||||||
|
|
||||||
private String getOutputId() {
|
private String getOutputId() {
|
||||||
outputNumber++;
|
outputNumber++;
|
||||||
String outputId = "OutputId_" + outputNumber;
|
String outputId = "OutputId_" + requestId + "_" + outputNumber;
|
||||||
GWT.log("Generated OutputId: " + outputId);
|
GWT.log("Generated OutputId: " + outputId);
|
||||||
return outputId;
|
return outputId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the results.
|
* Adds the results.
|
||||||
*
|
*
|
||||||
|
@ -633,7 +634,7 @@ public class CorrelationPanelResult extends Composite {
|
||||||
yPos += 4;
|
yPos += 4;
|
||||||
|
|
||||||
var correlationParametersInputKPIs = $doc
|
var correlationParametersInputKPIs = $doc
|
||||||
.getElementById('CorrelationParameterInputKPIs');
|
.getElementById('CorrelationParameterInputKPIs_'+requestId);
|
||||||
|
|
||||||
console.log('InputKPIs: ' + correlationParametersInputKPIs);
|
console.log('InputKPIs: ' + correlationParametersInputKPIs);
|
||||||
|
|
||||||
|
@ -647,6 +648,9 @@ public class CorrelationPanelResult extends Composite {
|
||||||
fillColor : [ 211, 225, 241 ]
|
fillColor : [ 211, 225, 241 ]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
bodyStyles : {
|
||||||
|
minCellWidth: 20
|
||||||
|
},
|
||||||
html : correlationParametersInputKPIs
|
html : correlationParametersInputKPIs
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -469,7 +469,7 @@ public class SpeedometerPanelResult {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i == outputNumber) {
|
if (i == outputIteration) {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (pdfHeightInMM - yPos < pdfHeightInMM / 4) {
|
if (pdfHeightInMM - yPos < pdfHeightInMM / 4) {
|
||||||
|
|
|
@ -107,7 +107,7 @@ public class SynopticTablePanelResult {
|
||||||
PerformFishResources.INSTANCE.synopticTable().getText(), submitRequestPanel);
|
PerformFishResources.INSTANCE.synopticTable().getText(), submitRequestPanel);
|
||||||
HorizontalPanel res = new HorizontalPanel();
|
HorizontalPanel res = new HorizontalPanel();
|
||||||
|
|
||||||
savePDFButton = new Button();
|
savePDFButton = new Button();
|
||||||
savePDFButton.getElement().getStyle().setMargin(10, Unit.PX);
|
savePDFButton.getElement().getStyle().setMargin(10, Unit.PX);
|
||||||
savePDFButton.setIcon(IconType.PRINT);
|
savePDFButton.setIcon(IconType.PRINT);
|
||||||
savePDFButton.addClickHandler(new ClickHandler() {
|
savePDFButton.addClickHandler(new ClickHandler() {
|
||||||
|
@ -207,10 +207,10 @@ public class SynopticTablePanelResult {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
savePDFButton.setVisible(false);
|
savePDFButton.setVisible(true);
|
||||||
|
|
||||||
final String toTitle = title;
|
final String toTitle = title;
|
||||||
|
|
||||||
outputNumber = 1;
|
outputNumber = 1;
|
||||||
|
|
||||||
for (OutputFile outputFile : dmResponse.getListOutput()) {
|
for (OutputFile outputFile : dmResponse.getListOutput()) {
|
||||||
|
@ -376,7 +376,7 @@ public class SynopticTablePanelResult {
|
||||||
//pdoc.text("Analysis:", xPos, yPos, 'left');
|
//pdoc.text("Analysis:", xPos, yPos, 'left');
|
||||||
yPos += 6;
|
yPos += 6;
|
||||||
|
|
||||||
for (var i = 1; i <= outputIteration; i++) {
|
for (var i = 1; i <= outputIteration; i++) {
|
||||||
|
|
||||||
for (var j = 1; j <= outputNumber; j++) {
|
for (var j = 1; j <= outputNumber; j++) {
|
||||||
|
|
||||||
|
@ -419,51 +419,58 @@ public class SynopticTablePanelResult {
|
||||||
var checkColor = function(data) {
|
var checkColor = function(data) {
|
||||||
if (data.section === 'body') {
|
if (data.section === 'body') {
|
||||||
console.log(data);
|
console.log(data);
|
||||||
var good = '<div class="gwt-HTML"><span style="padding-left: 10px; padding-right: 10px; background-color: limegreen; border: 1px solid limegreen;"></span></div>';
|
|
||||||
var normal = '<div class="gwt-HTML"><span style="padding-left: 10px; padding-right: 10px; background-color: yellow; border: 1px solid yellow;"></span></div>';
|
|
||||||
var bad = '<div class="gwt-HTML"><span style="padding-left: 10px; padding-right: 10px; background-color: red;border: 1px solid red;"></span></div>';
|
|
||||||
|
|
||||||
if (typeof data.cell !== 'undefined'
|
if (typeof data.cell !== 'undefined'
|
||||||
&& data.cell !== null) {
|
&& data.cell !== null) {
|
||||||
if (typeof data.cell.raw !== 'undefined'
|
if (typeof data.cell.raw !== 'undefined'
|
||||||
&& data.cell.raw !== null) {
|
&& data.cell.raw !== null) {
|
||||||
|
|
||||||
console.log(data.cell.raw.innerHTML);
|
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');
|
console.log('good');
|
||||||
var posIW = (data.cell.x + (data.cell.width / 2)-2);
|
data.cell.styles.fillColor = [ 50,
|
||||||
var posIH = (data.cell.y + (data.cell.height / 2)-2);
|
205, 50 ];
|
||||||
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);
|
//var posIW = (data.cell.x
|
||||||
//pdoc.setFontSize(10);
|
// + (data.cell.width / 2) - 2);
|
||||||
//pdoc.setFontType("normal");
|
//var posIH = (data.cell.y
|
||||||
//var posW = (data.cell.x + (data.cell.width / 2));
|
// + (data.cell.height / 2) - 2);
|
||||||
//var posH = (data.cell.y + (data.cell.height / 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.text('G', posW, posH,'center');
|
//pdoc.addImage(greenImg, 'JPEG',
|
||||||
|
// posIW, posIH, 4, 4);
|
||||||
} else {
|
} else {
|
||||||
if (data.cell.raw.innerHTML === normal) {
|
if (data.cell.raw.innerHTML
|
||||||
|
.indexOf(normal) >= 0) {
|
||||||
console.log('normal');
|
console.log('normal');
|
||||||
var posIW = (data.cell.x + (data.cell.width / 2)-2);
|
data.cell.styles.fillColor = [
|
||||||
var posIH = (data.cell.y + (data.cell.height / 2)-2);
|
255, 255, 0 ];
|
||||||
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='
|
//var posIW = (data.cell.x
|
||||||
pdoc.addImage(yellowImg, 'JPEG', posIW, posIH, 4, 4);
|
// + (data.cell.width / 2) - 2);
|
||||||
//pdoc.setFontSize(10);
|
//var posIH = (data.cell.y
|
||||||
//pdoc.setFontType("normal");
|
// + (data.cell.height / 2) - 2);
|
||||||
//var posW = (data.cell.x + (data.cell.width / 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='
|
||||||
//var posH = (data.cell.y + (data.cell.height / 2));
|
//pdoc.addImage(yellowImg,
|
||||||
//pdoc.text('N', posW, posH,'center');
|
// 'JPEG', posIW, posIH,
|
||||||
|
// 4, 4);
|
||||||
} else {
|
} else {
|
||||||
if (data.cell.raw.innerHTML === bad) {
|
if (data.cell.raw.innerHTML
|
||||||
|
.indexOf(bad) >= 0) {
|
||||||
console.log('bad');
|
console.log('bad');
|
||||||
var posIW = (data.cell.x + (data.cell.width / 2)-2);
|
data.cell.styles.fillColor = [
|
||||||
var posIH = (data.cell.y + (data.cell.height / 2)-2);
|
255, 0, 0 ];
|
||||||
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=='
|
//var posIW = (data.cell.x
|
||||||
pdoc.addImage(redImg, 'JPEG', posIW, posIH, 4, 4);
|
// + (data.cell.width / 2) - 2);
|
||||||
//pdoc.setFontSize(10);
|
//var posIH = (data.cell.y
|
||||||
//pdoc.setFontType("normal");
|
// + (data.cell.height / 2) - 2);
|
||||||
//var posW = (data.cell.x + (data.cell.width / 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=='
|
||||||
//var posH = (data.cell.y + (data.cell.height / 2));
|
//pdoc.addImage(redImg,
|
||||||
//pdoc.text('B', posW, posH,'center');
|
// 'JPEG', posIW,
|
||||||
|
// posIH, 4, 4);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -482,9 +489,11 @@ public class SynopticTablePanelResult {
|
||||||
startY : yPos,
|
startY : yPos,
|
||||||
pageBreak : 'auto',
|
pageBreak : 'auto',
|
||||||
bodyStyles : {
|
bodyStyles : {
|
||||||
fontSize : 9
|
fontSize : 6,
|
||||||
|
minCellWidth : 11
|
||||||
},
|
},
|
||||||
didDrawCell : checkColor,
|
//didDrawCell : checkColor,
|
||||||
|
didParseCell : checkColor,
|
||||||
html : secondTable
|
html : secondTable
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -524,15 +533,15 @@ public class SynopticTablePanelResult {
|
||||||
console.log('Result Type is undefined:' + i);
|
console.log('Result Type is undefined:' + i);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
if (j == outputNumber) {
|
||||||
|
|
||||||
if (i == outputNumber) {
|
} else {
|
||||||
|
if (pdfHeightInMM - yPos < pdfHeightInMM / 7) {
|
||||||
} else {
|
pdoc.addPage();
|
||||||
if (pdfHeightInMM - yPos < pdfHeightInMM / 7) {
|
yPos = tMargin; // Restart position
|
||||||
pdoc.addPage();
|
}
|
||||||
yPos = tMargin; // Restart position
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue