Skip to content

B
business-java
Commit fc595619 authored by sbade's avatar sbade
Browse files
Options

added new code and js for heat map and also added new linked graph code. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97205 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 86b3df65
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3330 additions and 119 deletions
webitm-dashboard/web/sfadashboard/src/ibase.client/CustomGrid.java
View file @ fc595619
...@@ -71,6 +71,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -71,6 +71,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public FlexTable jsonToArrayList(HashMap<String, HashMap> gridNGraphMeataDataMap,JSONObject jsonObjGridData ,String dataSrc,String componentId) public FlexTable jsonToArrayList(HashMap<String, HashMap> gridNGraphMeataDataMap,JSONObject jsonObjGridData ,String dataSrc,String componentId)
{ {
//sample(dataSrc);
//Window.alert("in jsonarray"); //Window.alert("in jsonarray");
DataGridTableRowModel rowDataGrid= null; DataGridTableRowModel rowDataGrid= null;
E12CustomTextCell.CellData celldata = null; E12CustomTextCell.CellData celldata = null;
...@@ -371,7 +372,6 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -371,7 +372,6 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
contextMenuPanel.show(); contextMenuPanel.show();
} }
} }
webitm-dashboard/web/sfadashboard/src/ibase.client/FilterCreator.java
View file @ fc595619
...@@ -989,22 +989,28 @@ public class FilterCreator extends Composite ...@@ -989,22 +989,28 @@ public class FilterCreator extends Composite
public void setTitleOnFilterSubmit(ArrayList<String> parameterList,JSONObject metaDataJsnObj) public void setTitleOnFilterSubmit(ArrayList<String> parameterList,JSONObject metaDataJsnObj)
{ {
if(GWTDashBoardReport.flag) if(GWTDashBoardReport.flag)
{ {
subTitle= Window.Location.getParameter("titleName"); subTitle= Window.Location.getParameter("titleName");
} }
title = new MetaDataDtl().getTitle(metaDataJsnObj); title = new MetaDataDtl().getTitle(metaDataJsnObj);
if (title.size() > 1)
{ if (title.size() > 1)
label.setText(title.get(0) + ":" + getMonth(parameterList.get(1)) + title.get(1) + getMonth(parameterList.get(2))); {
} label.setText(title.get(0) + " : " + getMonth(parameterList.get(1)) + title.get(1) + getMonth(parameterList.get(2)));
else if(subTitle.trim().length()>0) }
{ else if (title.size() == 1 && (subTitle=="undefined") || (subTitle.equals("undefined")) || (subTitle.equalsIgnoreCase("undefined")))
label.setText( subTitle + ":" + getMonth(parameterList.get(1)) ); {
} label.setText(title.get(0) + " : " + getMonth(parameterList.get(1)));
else }
{ //if(subTitle.trim().length()>0)
label.setText(title.get(0)+ ":" +getMonth( parameterList.get(1)));//+ "-" + parameterList.get(2)); else if( (title.size() == 1 && (subTitle!="") || (!subTitle.equals("")) || (!subTitle.equalsIgnoreCase(""))))
} {
label.setText( subTitle + " : " + getMonth(parameterList.get(1)) );
}
else
{
label.setText(title.get(0)+ " : " +getMonth( parameterList.get(1)));//+ "-" + parameterList.get(2));
}
} }
} }
\ No newline at end of file
webitm-dashboard/web/sfadashboard/src/ibase.client/GWTDashBoardReport.java
View file @ fc595619
...@@ -89,7 +89,7 @@ public class GWTDashBoardReport implements EntryPoint ...@@ -89,7 +89,7 @@ public class GWTDashBoardReport implements EntryPoint
{ {
for (FilterInfo filterInfo : filterList) for (FilterInfo filterInfo : filterList)
{ {
if(filterInfo.getColNameId().equals("PRD_CODE")) if(filterInfo.getColNameId().equals("PRD_SALESDASH"))
{ {
parameterList.add(Window.Location.getParameter(filterInfo.getColNameId()) == null ? monthYear : Window.Location.getParameter(filterInfo.getColNameId())); parameterList.add(Window.Location.getParameter(filterInfo.getColNameId()) == null ? monthYear : Window.Location.getParameter(filterInfo.getColNameId()));
} }
......
webitm-dashboard/web/sfadashboard/src/ibase.client/GraphComponent.java
View file @ fc595619
...@@ -59,6 +59,7 @@ public class GraphComponent extends Composite ...@@ -59,6 +59,7 @@ public class GraphComponent extends Composite
*/ */
public GraphComponent(ArrayList<String> parameterList, JSONObject metaDataJsnObj) public GraphComponent(ArrayList<String> parameterList, JSONObject metaDataJsnObj)
{ {
this.jsonObjMetaData = metaDataJsnObj; this.jsonObjMetaData = metaDataJsnObj;
this.parameterList = parameterList; this.parameterList = parameterList;
mainContainer.setWidth("100%"); mainContainer.setWidth("100%");
...@@ -120,9 +121,6 @@ public class GraphComponent extends Composite ...@@ -120,9 +121,6 @@ public class GraphComponent extends Composite
{*/ // for only OTC {*/ // for only OTC
for (String componentId : gridNGraphMeataDataMap.keySet()) for (String componentId : gridNGraphMeataDataMap.keySet())
{ {
jsonObjFrGraph=new JSONObject(); jsonObjFrGraph=new JSONObject();
if(isNumeric(componentId)) if(isNumeric(componentId))
{ {
...@@ -165,7 +163,6 @@ public class GraphComponent extends Composite ...@@ -165,7 +163,6 @@ public class GraphComponent extends Composite
} }
else if("T".equalsIgnoreCase(type)) else if("T".equalsIgnoreCase(type))
{ {
if(jsonObjFrGraph != null) if(jsonObjFrGraph != null)
{ {
RootPanel.get("chartContainer"+componentId).clear(); RootPanel.get("chartContainer"+componentId).clear();
...@@ -230,9 +227,27 @@ public class GraphComponent extends Composite ...@@ -230,9 +227,27 @@ public class GraphComponent extends Composite
} }
} }
/** End Code By Dhanendra for No Data Found Msg **/ /** End Code By Dhanendra for No Data Found Msg **/
} }
if ("H".equalsIgnoreCase(type))
{
for (String graphNo : graphDataMap.keySet())
{
graphDtlList = graphDataMap.get(graphNo);
imageName = (String) graphDtlList.get(0);
width = (String) graphDtlList.get(1);
height = (String) graphDtlList.get(2);
graphJson = ChartCreator.buildHeatMap(graphDtlList, jsonObjFrGraph, dtSrouce); // start- added empty json chartdata to display no data found message by swati on 7jan2015
if(graphJson.size()==0 )
{
graphJson.put("chart", new JSONString(""));
}
// end- added empty json chartdata to display no data found message by swati on 7jan2015
if (graphJson != null && graphJson.size() > 0)
{
this.createChart(graphJson.toString().replace('$', '='), "chartContainer" + componentId, "chartContainer" + componentId, width, height, imageName);
}
}
}
} }
} }
/*}else /*}else
...@@ -296,7 +311,6 @@ public class GraphComponent extends Composite ...@@ -296,7 +311,6 @@ public class GraphComponent extends Composite
/** End Added New code By sachin for Creating Dynamic Url For Report on 04/12/14**/ /** End Added New code By sachin for Creating Dynamic Url For Report on 04/12/14**/
/*if (page.equals("sales")) /*if (page.equals("sales"))
{ {
objActionPath = "/ibase/" + servletname + "?month=" + parameterList.get(1) + "&dataSourceName=" + dbDataSource; objActionPath = "/ibase/" + servletname + "?month=" + parameterList.get(1) + "&dataSourceName=" + dbDataSource;
...@@ -383,7 +397,6 @@ public class GraphComponent extends Composite ...@@ -383,7 +397,6 @@ public class GraphComponent extends Composite
JSONObject jsonObjData = new JSONObject(); JSONObject jsonObjData = new JSONObject();
jsonObjData.put(key, servletJsnObj); jsonObjData.put(key, servletJsnObj);
componentDataMap.put(key, jsonObjData); componentDataMap.put(key, jsonObjData);
}else }else
{ {
componentDataMap.put(key, null); componentDataMap.put(key, null);
...@@ -391,7 +404,7 @@ public class GraphComponent extends Composite ...@@ -391,7 +404,7 @@ public class GraphComponent extends Composite
} }
if (componentDataMap.size() == datsSourceDtlMap.size()) if (componentDataMap.size() == datsSourceDtlMap.size())
{ {
buildChart(componentDataMap); buildChart(componentDataMap);
} }
} else } else
......
webitm-dashboard/web/sfadashboard/war/FusionChart/js/fusioncharts.charts.js 0 → 100755
View file @ fc595619
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-dashboard/web/sfadashboard/war/FusionChart/js/fusioncharts.powercharts.js 0 → 100755
View file @ fc595619
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-dashboard/web/sfadashboard/war/FusionChart/js/fusioncharts.widgets.js 0 → 100755
View file @ fc595619
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-dashboard/web/sfadashboard/war/GwtDashboardHeatMap.html 0 → 100755
View file @ fc595619
<!doctype html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link type="text/css" rel="stylesheet" href="GwtDashboardPage.css">
<script type="text/javascript" language="javascript" src="FusionChart/js/BuildChart.js"></script>
<script type="text/javascript" language="javascript" src="FusionChart/js/fusioncharts.js"></script>
<script type="text/javascript" language="javascript" src="gwtdashboardreport/gwtdashboardreport.nocache.js"></script>
</head>
<body>
<div id="filterDiv" class="filterDiv"></div>
<div id="optioDiv"></div>
<div id="chartContainer" >
<table >
<tr>
<td><div id="chartContainer1" class="chartContainer"></div></td>
<td><div id="chartContainer2" class="chartContainer"></div></td>
</tr>
<tr> <td colspan="2"><div id="chartContainer3" class="chartContainer"></div></td></tr>
<tr> <td colspan="2"><div id="chartContainer4" class="chartContainer"></div></td></tr>
<tr> <td colspan="2"><div id="chartContainer5" class="chartContainer" ></div></td></tr>
<tr>
<td><div id="chartContainer6" class="chartContainer" ></div></td>
<td><div id="chartContainer7" class="chartContainer"></div></td>
</tr>
<tr>
<td><div id="chartContainer8" class="chartContainer" ></div></td>
<td><div id="chartContainer9" class="chartContainer"></div></td>
</tr>
<tr>
<td><div id="chartContainer10" class="chartContainer" ></div></td>
<td><div id="chartContainer11" class="chartContainer"></div></td>
</tr>
</table>
</div>
<!-- <body>
<div id="chartContainer1" class="chartContainer1">FusionCharts will load here...</div>
</body> -->
</body>
</html>
webitm-dashboard/web/sfadashboard/war/GwtDashboardPage.html
View file @ fc595619
...@@ -3,28 +3,48 @@ ...@@ -3,28 +3,48 @@
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link type="text/css" rel="stylesheet" href="GwtDashboardPage.css"> <link type="text/css" rel="stylesheet" href="GwtDashboardPage.css">
<link type="text/css" rel="stylesheet" href="CwCustomDataGrid.css"> <script type="text/javascript" language="javascript" src="FusionChart/js/BuildChart.js"></script>
<link type="text/css" rel="stylesheet" href="BaseE12.css"> <script type="text/javascript" language="javascript" src="FusionChart/js/FusionCharts.js"></script>
<script type="text/javascript" language="javascript" src="FusionChart/js/BuildChart.js"></script> <script type="text/javascript" language="javascript" src="gwtdashboardreport/gwtdashboardreport.nocache.js"></script>
<script type="text/javascript" language="javascript" src="FusionChart/js/FusionCharts.js"></script>
<script type="text/javascript" language="javascript" src="gwtdashboardreport/gwtdashboardreport.nocache.js"></script>
</head> </head>
<body> <body>
<div id="filterDiv" class="filterDiv"></div> <div id="filterDiv" class="filterDiv"></div>
<div id="optioDiv"></div> <div id="optioDiv"></div>
<div id="view1"> <div id="chartContainer" >
<table class="tableCSS" cellpadding=0; cellspacing=0;> <table >
<tr>
<td><div id="chartContainer1" class="chartContainer"></div></td>
<td><div id="chartContainer2" class="chartContainer"></div></td>
</tr>
<tr> <td colspan="2"><div id="chartContainer3" class="chartContainer"></div></td></tr>
<tr> <td colspan="2"><div id="chartContainer4" class="chartContainer"></div></td></tr>
<tr> <td colspan="2"><div id="chartContainer5" class="chartContainer" ></div></td></tr>
<tr>
<td><div id="chartContainer6" class="chartContainer" ></div></td>
<td><div id="chartContainer7" class="chartContainer"></div></td>
</tr>
<tr>
<td><div id="chartContainer8" class="chartContainer" ></div></td>
<td><div id="chartContainer9" class="chartContainer"></div></td>
</tr>
<tr>
<td><div id="chartContainer10" class="chartContainer" ></div></td>
<td><div id="chartContainer11" class="clhartContainer"></div></td>
</tr>
<tr><td> <div id="chartContainer1" class="chartContainer" ></div></td></tr>
<tr><td ><div id="chartContainer2" class="chartContainer" ></div></td></tr>
<tr><td ><div id="chartContainer3" class="chartContainer" ></div></td></tr>
<tr><td ><div id="chartContainer4" class="chartContainer" ></div></td></tr>
<tr><td ><div id="chartContainer5" class="chartContainer" ></div></td></tr>
<tr><td ><div id="chartContainer6" class="chartContainer" ></div></td></tr>
<tr><td ><div id="chartContainer7" class="chartContainer" ></div></td></tr>
</table> </table>
</div> </div>
<!-- <body>
<div id="chartContainer1" class="chartContainer1">FusionCharts will load here...</div>
</body> -->
</body> </body>
</html> </html>
webitm-dashboard/web/sfadashboard/war/NewFile.xml deleted 100755 → 0
View file @ 86b3df65
<?xml version="1.0" encoding="UTF-8"?>
<DASHBAORD_PAGE>
<OBJ_NAME>
</OBJ_NAME>
<DATA_SRC>
</DATA_SRC>
<FILTERS>
<FILTER>
<COL_NAME></COL_NAME>
<DISPLAY></DISPLAY>
<SQL></SQL>
</FILTER>
<FILTER>
<COL_NAME></COL_NAME>
<DISPLAY></DISPLAY>
<SQL></SQL>
</FILTER>
</FILTERS>
<ANALYSIS_SCOPE>
</ANALYSIS_SCOPE>
<GROUP_COMP>
<HEADER>
<![CDATA[Header]]>
</HEADER>
<FUNSION_CHART>
</FUNSION_CHART>
<FLAT_TABLE>
<COLUMN_NAME pos="1">
<![CDATA[ EmpCode ]]>
</COLUMN_NAME>
<COLUMN_NAME pos="2">
<![CDATA[ First Name ]]>
</COLUMN_NAME>
<COLUMN_NAME pos="3">
<![CDATA[ Last Name ]]>
</COLUMN_NAME>
</FLAT_TABLE>
</GROUP_COMP>
</DASHBAORD_PAGE>
<Errors>
<error id="VTORDVST01" type="E" column_name="line_no_1">
<message>Error : Invalid order of visit</message>
<description>Order of visit is must and should be Numeric
</description>
<type>E</type>
<option></option>
<time></time>
<alarm></alarm>
<source></source>
<trace>Error : Invalid order of visit</trace>
<redirect>1</redirect>
</error>
</Errors>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment