Skip to content

B
business-java
Commit 6a36a046 authored by dkasliwal's avatar dkasliwal
Browse files
Options

modify smart filter buildchart method. in that method add dyanamic container... 

modify smart filter buildchart method. in that method add dyanamic container code. and add  outerChartContainerSmtFltr1of1 css class in GwtDashboardPage.css  file.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98538 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e61fccb6
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 36 deletions
webitm-dashboard/GWT-Component/src/ibase/client/GraphComponent.java
View file @ 6a36a046
......@@ -25,6 +25,7 @@ import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
......@@ -636,8 +637,39 @@ public class GraphComponent extends Composite
HashMap<String, ArrayList<String>> graphTypeMap = null;
String dtSrouce = "";
/*Added By Dhanendra on 25May2015 for Group*/
ArrayList<String> groupNameList = null;
ArrayList<String> componantTitlNameList = null;
ArrayList<String> groupCssTypeNameList = null;
ArrayList<String> refreshComponantIdList = null;
JSONObject fltrDataJson = null;
ArrayList<String> gridRefCompontList = null;
HashMap<String, HashMap<String, String>> groupTypeMap = null;
HashMap<String, ArrayList<String>> gridRefCompontDataMap = null;
HashMap<String, HashMap<String, String>> gridCssMap = null;
HashMap<String, HashMap<String, String>> gridIconMap = null;
HashMap<String, ArrayList<String>> gridComponantTitleMap = null;
HashMap<String, ArrayList<String>> remarkTextMap = null;
JSONObject dataJsn = null;
JSONObject rawDataMapJsonOuter = null;
JSONObject mainDataJsn = null;
HashMap<String, JSONObject> avlDateMap = null;
JSONObject fetchRowWiseVal =null;
String availableDate = "available_dy";
Label gridTitleLbl = null;
int count=0;
JSONObject filtrGridJSN = null;
String avlDate = "";
String componentIconName = "";
/*Ended By Dhanendra on 25May2015 for Group*/
/*add for heading for SS Grid*/
ArrayList<String> headingOfSSGridList = null;
/*End for heading for SS Grid*/
/** Add Code By Dhanendra for No Data Found Msg **/
String parameter = "";
/*String parameter = "";
boolean isParameter = false;
for (int i = 0; i < parameterList.size(); i++)
{
......@@ -649,21 +681,26 @@ public class GraphComponent extends Composite
isParameter = true;
}
}
}
}*/
/** End Code By Dhanendra for No Data Found Msg **/
/*Window.alert("idList :"+idList);
if (idList.size() > 0)
{
for (int i = 0; i < idList.size(); i++)
{
RootPanel panel = RootPanel.get("chartContainer" + idList.get(i));
comment line because of container name change by Dhanedra 01-07-15
//RootPanel panel = RootPanel.get("chartContainer" + idList.get(i));
comment line because of container name change by Dhanedra 01-07-15
RootPanel panel = RootPanel.get(idList.get(i));
panel.clear();
if (panel.getElement().getFirstChild() != null)
{
panel.getElement().getFirstChild().removeFromParent();
//panel.getElement().getFirstChild().removeFromParent();
panel.getElement().removeFromParent();
}
}
idList = new ArrayList<String>();
}
}*/
/*
* if(dataMap.toString().length()>20) //if loop for no data found alert
* {
......@@ -673,7 +710,7 @@ public class GraphComponent extends Composite
jsonObjFrGraph = new JSONObject();
if (isNumeric(componentId))
{
idList.add(componentId);
//idList.add(componentId);
compType = componentType.trim() + componentId.trim();
graphDataMap = gridNGraphMeataDataMap.get(componentId);
datasourceMap = gridNGraphMeataDataMap.get("datasource" + componentId);
......@@ -687,6 +724,23 @@ public class GraphComponent extends Composite
{
componentTypeMap = gridNGraphMeataDataMap.get(compType);
component = "" + componentTypeMap.get("buildComponent" + componentId);
/* Add code for get value from metadata by Dhanendra 10Jun2015*/
groupTypeMap = gridNGraphMeataDataMap.get("groupName"+componentId);
gridGroupName = ""+ groupTypeMap.get("groupName"+componentId);
gridRefCompontDataMap = gridNGraphMeataDataMap.get("refreshCompont"+componentId);
gridRefCompontList = gridRefCompontDataMap.get("refreshCompont"+componentId);
gridCssMap = gridNGraphMeataDataMap.get("cssName"+componentId);
gridCssName = ""+ gridCssMap.get("cssName"+componentId);
gridComponantTitleMap = gridNGraphMeataDataMap.get("componantTitle"+componentId);
gridComponantTitleName = ""+ gridComponantTitleMap.get("componantTitle"+componentId);
// added by swati to add image in grid title
gridIconMap= gridNGraphMeataDataMap.get("iconName"+componentId);
gridIconName = ""+ gridIconMap.get("iconName"+componentId);
// ended by swati to add image in grid title
/* End code for get value from metadata by Dhanendra 10Jun2015*/
}
jsonObjFrGraph = (JSONObject) dataMap.get(dtSrouce);
......@@ -712,23 +766,107 @@ public class GraphComponent extends Composite
imageName = (String) graphDtlList.get(0);
width = (String) graphDtlList.get(1);
height = (String) graphDtlList.get(2);
graphJson = ChartCreator.buildChartData(graphDtlList, jsonObjFrGraph, dtSrouce,parameterList,filterList);
// start- added empty json chartdata to display no data found message by swati on 7jan2015
if (graphJson.size() == 0)
/*Add Code for display Dashboard one by one in one page by Dhanendra*/
groupNameList =(ArrayList<String>)graphDtlList.get(17);
componantTitlNameList =(ArrayList<String>)graphDtlList.get(18);
groupCssTypeNameList =(ArrayList<String>)graphDtlList.get(19);
componentIconName = ""+graphDtlList.get(22);
headingOfSSGridList =(ArrayList<String>)graphDtlList.get(24);
if(groupNameList.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)
refreshComponantIdList =(ArrayList<String>)graphDtlList.get(20);
refCompIdMap.put(groupNameList.get(0), refreshComponantIdList.get(0));
rawDataMapJsonOuter = new JSONObject();
fltrDataJson = new JSONObject();
dataJsn = (JSONObject) jsonObjFrGraph.get(dtSrouce);
mainDataJsn = new JSONObject();
mainDataJsn.put("1", dataJsn);
if(componentId.equals("1"))
{
rawDataMapJsonOuter = getDataMapJson(dataJsn, groupNameList.get(0),graphDtlList);
grpNameList.add(groupNameList.get(0));
}else{
if(jsonAftrFltr.size() == 0)
{
fltrDataJson = getFltrDataJson(dataJsn, grpNameList.get(0),null);
}else{
fltrDataJson = getFltrDataJson(jsonAftrFltr, grpNameList.get(0),null);
}
rawDataMapJsonOuter = getDataMapJson(fltrDataJson, groupNameList.get(0),graphDtlList);
grpNameList = new ArrayList<String>();
grpNameList.add(groupNameList.get(0));
jsonAftrFltr = fltrDataJson;
}
if(rawDataMapJsonOuter.size() > 0)
{
getDisplayData(rawDataMapJsonOuter, graphDtlList, groupCssTypeNameList.get(0), width, height, imageName,refCompIdMap,mainDataJsn,groupNameList.get(0),filterList);
}
}/*end Code for display Dashboard one by one in one page by Dhanendra*/
else
{
this.createChart(graphJson.toString().replace('@', '='), componentId, "chartContainer" + componentId, width, height, imageName, userMail, reportCaption);
graphJson = ChartCreator.buildChartData(graphDtlList, jsonObjFrGraph, dtSrouce,parameterList,filterList);
// 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)
{
/*Added code for Dyanamic Div and New CSS By Dhanendra 01-07-15*/
this.createOuterDiv("Graph"+componentId,type,groupCssTypeNameList.get(0));
idList.add("Graph"+componentId+"Div");
Label componantTtl = new Label(componantTitlNameList.get(0));
Image componantTtlImg = new Image("FusionChart/images/"+componentIconName);
Image refreshImg = new Image("FusionChart/images/refresh.png");
SimpleDateFormat dispDateTimeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
Date date = new Date();
String strDate = dispDateTimeFormat.format(date);
String dateformat = getTimeSince(strDate);
Label refreshDateTime = new Label(dateformat);
HorizontalPanel componantTtlPanel = new HorizontalPanel();
HorizontalPanel dateHPanel = new HorizontalPanel();
componantTtlImg.setStyleName("componantTtlImg");
componantTtl.setStyleName("componantTtl");
componantTtlPanel.add(componantTtlImg);
componantTtlPanel.add(componantTtl);
refreshDateTime.setStyleName("refreshDateTime");
dateHPanel.setStyleName("refreshDatePanel");
dateHPanel.add(refreshImg);
dateHPanel.add(refreshDateTime);
HorizontalPanel mainPanel = new HorizontalPanel();
mainPanel.add(componantTtlPanel);
mainPanel.add(dateHPanel);
mainPanel.setStyleName("mainPanel");
mainPanel.setCellHorizontalAlignment(dateHPanel, HasHorizontalAlignment.ALIGN_RIGHT);
RootPanel.get("Graph"+componentId+"head").add(mainPanel);
this.createInnerDiv(Integer.parseInt(componentId),"Graph"+componentId);
if(headingOfSSGridList.size()>0)
{
HTMLPanel htmlPanel = new HTMLPanel(headingOfSSGridList.get(0));
RootPanel.get("chart"+componentId).add(htmlPanel);
}
/*Ended code for Dyanamic Div and New CSS By Dhanendra 01-07-15*/
this.createChart(graphJson.toString().replace('@', '='), componentId, "chartContainer" + componentId, width, height, imageName,userMail,reportCaption);
}
}
}
} else if ("T".equalsIgnoreCase(type))
{
if (jsonObjFrGraph != null)
{
RootPanel.get("chartContainer" + componentId).clear();
//RootPanel.get("chartContainer" + componentId).clear();
//RootPanel.get().clear();
scrlPanel = new ScrollPanel();
flexTable = new FlexTable();
......@@ -753,13 +891,64 @@ public class GraphComponent extends Composite
RootPanel.get("chartContainer" + componentId).add(horizontalPnl);
} else if ("DataGrid".equalsIgnoreCase(component))
{
flexTable = new FlexTable();
{
flexTable = new FlexTable();
CustomGrid data = new CustomGrid(8);
flexTable = data.jsonToArrayList(gridNGraphMeataDataMap, jsonObjFrGraph, dtSrouce, componentId,parameterList, filterList,firstIndex);
Button excelBtn = new Button("Export To Excel");
excelBtn.setTitle("Excel");
RootPanel.get("chartContainer" + componentId).add(flexTable);
/*Add code check condition for gridGroupName present in metadata*/
filtrGridJSN = new JSONObject();
if(gridGroupName.length() == 0)
{
flexTable = data.jsonToArrayList(gridNGraphMeataDataMap, jsonObjFrGraph,dtSrouce,componentId,parameterList, filterList,firstIndex);
/*Added code for Dyanamic Div and New CSS By Dhanendra 01-07-15*/
Image gridTtlImg = new Image("FusionChart/images/"+gridIconName);
HorizontalPanel gridTtlPanel = new HorizontalPanel();
gridTitleLbl = new Label(gridComponantTitleName);
gridTtlImg.setStyleName("componantTtlImg");
gridTitleLbl.setStyleName("componantTtl");
gridTtlPanel.add(gridTtlImg);
gridTtlPanel.add(gridTitleLbl);
this.clearContainer("Grid"+componentId);
this.createOuterDiv("Grid"+componentId,type,gridCssName);
idList.add("Grid"+componentId+"Div");
RootPanel.get("Grid"+componentId+"head").add(gridTtlPanel);
RootPanel.get("Grid"+componentId+"Div").add(flexTable);
/*Ended code for Dyanamic Div and New CSS By Dhanendra 01-07-15*/
/*RootPanel.get("chartContainer"+componentId).clear();
RootPanel.get("chartContainer"+componentId).add(flexTable);*/
}else{
fltrDataJson = getFltrDataJson(fltrDataJson, gridGroupName,null);
avlDateMap = new HashMap<String, JSONObject>();
dataJsn = new JSONObject();
for (int jsnCnt = 0; jsnCnt < fltrDataJson.size(); jsnCnt++)
{
fetchRowWiseVal = (JSONObject) fltrDataJson.get(String.valueOf(jsnCnt));
avlDate = "" + fetchRowWiseVal.get(availableDate).toString().replace("\"", "");
avlDateMap.put(avlDate, (JSONObject)fetchRowWiseVal);
}
count =0;
for (Map.Entry<String, JSONObject> avlMap : avlDateMap.entrySet())
{
dataJsn.put(""+count, avlMap.getValue());
count++;
}
filtrGridJSN.put(dtSrouce, dataJsn);
flexTable = data.jsonToArrayList(dataDtl.getGridNMapMetData(jsonObjMetaData,parameterList.get(parameterList.size()-1),parameterList), filtrGridJSN,dtSrouce,componentId,parameterList, filterList,firstIndex);
this.createOuterDiv(gridGroupName+"Grid",type,null);
Image gridTtlImg = new Image("FusionChart/images/"+gridIconName);
HorizontalPanel gridTtlPanel = new HorizontalPanel();
gridTitleLbl = new Label(firstIndex);
gridTtlImg.setStyleName("componantTtlImg");
gridTitleLbl.setStyleName("componantTtl");
gridTtlPanel.add(gridTtlImg);
gridTtlPanel.add(gridTitleLbl);
RootPanel.get(gridGroupName+"Gridhead").add(gridTtlPanel);
RootPanel.get(gridGroupName+"GridDiv").add(flexTable);
}
/*Add code check condition for gridGroupName present in metadata*/
}
}
/**
......@@ -768,29 +957,40 @@ public class GraphComponent extends Composite
**/
else
{
RootPanel.get("chartContainer" + componentId).clear();
if (isParameter)
{
flexTable = new FlexTable();
//RootPanel.get("chartContainer"+componentId).clear();
//if(isParameter)
//{
flexTable = new FlexTable();
graphCaptionList.clear();
graphCaptioneMap = gridNGraphMeataDataMap.get("componentCaption" + componentId);
graphCaptionList.add("" + graphCaptioneMap.get("componentCaption" + componentId));
caption = graphCaptionList.get(0);
graphCaptioneMap = gridNGraphMeataDataMap.get("componentCaption"+componentId);
graphCaptionList.add(""+graphCaptioneMap.get("componentCaption"+componentId));
caption = graphCaptionList.get(0);
Label labelNoDataFound = new Label("No Data Found");
if (caption != null && caption.trim().length() > 0)
if(caption !=null && caption.trim().length()>0)
{
flexTable.setText(0, 0, caption);
flexTable.setWidget(1, 0, labelNoDataFound);
flexTable.getCellFormatter().setStyleName(0, 0, "FlexTable-ColumnHeaderCell");
flexTable.getCellFormatter().setStyleName(1, 0, "gwt-ScrollTable");
} else
flexTable.getCellFormatter().setStyleName(0 ,0 , "FlexTable-ColumnHeaderCell");
flexTable.getCellFormatter().setStyleName(1 ,0 , "gwt-ScrollTable");
}else
{
Window.alert("In No Data Found else");
flexTable.setWidget(0, 0, labelNoDataFound);
flexTable.getCellFormatter().setStyleName(0, 0, "gwt-ScrollTable");
flexTable.getCellFormatter().setStyleName(0 ,0 , "gwt-ScrollTable");
}
flexTable.setStyleName("flexCSS");
RootPanel.get("chartContainer" + componentId).add(flexTable);
}
/*Added code for Dyanamic Div and New CSS By Dhanendra 01-07-15*/
gridTitleLbl = new Label(gridComponantTitleName);
this.clearContainer("Grid"+componentId);
this.createOuterDiv("Grid"+componentId,type,gridCssName);
idList.add("Grid"+componentId+"Div");
RootPanel.get("Grid"+componentId+"head").add(gridTitleLbl);
RootPanel.get("Grid"+componentId+"Div").add(flexTable);
/*Ended code for Dyanamic Div and New CSS By Dhanendra 01-07-15*/
/*RootPanel.get("chartContainer"+componentId).add(flexTable);*/
//}
}
/** End Code By Dhanendra for No Data Found Msg **/
}
......@@ -946,6 +1146,7 @@ public class GraphComponent extends Composite
if(i==0)
{
objActionPath=objActionPath + "?" + filterInfo.getColName()+"="+parameterList.get(cnt);
}else
{
objActionPath=objActionPath + "&" + filterInfo.getColName()+"="+parameterList.get(cnt);
......
webitm-dashboard/GWT-Component/src/ibase/client/SmartFiltrCreator.java
View file @ 6a36a046
......@@ -71,7 +71,8 @@ public class SmartFiltrCreator extends Composite
private void initPopUpPnl()
{
mainPopupPnl.setPopupPosition(30, 50);
mainPopupPnl.setPopupPosition(30, 60);
mainPopupPnl.setStylePrimaryName("vPanelCSS");
mainPopupPnl.getElement().setId("smartFilterMainOuterDiv");
this.buildSmrtFiltr();
......
webitm-dashboard/GWT-Component/war/GwtDashboardPage.css
View file @ 6a36a046
......@@ -1373,3 +1373,19 @@ color: #999; !important;
width: 100%;
}
/*Add CSS for SmartFilter on Date 28-08-15*/
.outerChartContainerSmtFltr1of1
{
width:82%;
position:relative;
MARGIN-TOP: 20PX;
MARGIN-LEFT: 20PX;
MIN-WIDTH: 300PX;
-webkit-box-shadow: -1px 0px 7px 1px rgba(153,145,153,0.77);
-moz-box-shadow: -1px 0px 7px 1px rgba(153,145,153,0.77);
box-shadow: -1px 0px 7px 1px rgba(153,145,153,0.77);
background-color: #fff;
float: left;
}
/*END CSS for SmartFilter on Date 28-08-15*/
\ 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