Skip to content

B
business-java
Commit 30c31c3d authored by dkasliwal's avatar dkasliwal
Browse files
Options

Pass current_d and child_d to all method of dash board to open a drill-down... 

Pass current_d and child_d to all method of dash board to open a drill-down dash board. remove frame container code and direct call to open a dash-board


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103450 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2173834e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 427 additions and 73 deletions
webitm-dashboard/GWT-Component/src/ibase/client/CardBuilder.java
View file @ 30c31c3d
......@@ -18,8 +18,9 @@ public class CardBuilder
{
/*Add ParameterList and filterList in buildCard method By Dhanendra on Date 01-04-2016*/
public SimplePanel buildCard(ArrayList<ArrayList<String>> graphDtlList, JSONObject jsonObjGraph, String dataSource,ArrayList<String> parameterList,ArrayList<FilterInfo> filterList)
public SimplePanel buildCard(ArrayList<ArrayList<String>> graphDtlList, JSONObject jsonObjGraph, String dataSource,ArrayList<String> parameterList,ArrayList<FilterInfo> filterList, String currentID)
{
/*Comment Code by Dhanendra on date 07-06-2016*/
//JSONObject jsonObjFrGraph = (JSONObject) jsonObjGraph.get(dataSource);
......@@ -214,7 +215,7 @@ public class CardBuilder
if(linkMetadataName.length() > 0)
{
//setOnClick(linkMetadataName, html,"/ibase/dwh/GwtDashboardPage.html?metadataname="+linkMetadataName+propertyStr);
setOnClick(linkMetadataName, html,"/ibase/dwh/GwtDashboardPage.html?metadataname="+linkMetadataName+propertyStr);
setOnClick(linkMetadataName, html,"/ibase/dwh/GwtDashboardPage.html?metadataname="+linkMetadataName+propertyStr,currentID);
}
/*End Add parameters to url for hyper link data By Swati on Date 05-05-2016*/
hOuterPnl.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
......@@ -282,7 +283,7 @@ public class CardBuilder
/*Add Add parameters to url for hyper link data By Swati on Date 05-05-2016*/
if(linkMetadataName.length() > 0)
{
setOnClick(linkMetadataName, html,"/ibase/dwh/GwtDashboardPage.html?metadataname="+linkMetadataName+propertyStr);
setOnClick(linkMetadataName, html,"/ibase/dwh/GwtDashboardPage.html?metadataname="+linkMetadataName+propertyStr,currentID);
}
/*End Add parameters to url for hyper link data By Swati on Date 05-05-2016*/
verticalPnl.add(horizontalPnl);
......@@ -310,16 +311,17 @@ public class CardBuilder
return simplePnl;
}
/*Added by Dhanendra for Linked Chart on 06-March-16 Start */
public void setOnClick(final String linkMetadata, final HTML html, final String url)
public void setOnClick(final String linkMetadata, final HTML html, final String url,final String currentID)
{
html.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
//Window.open(url, linkMetadata, "");
if(html.getElement().getAttribute("a") != null)
/*if(html.getElement().getAttribute("a") != null)
{
buildGridFrameContainer();
}
}*/
openLinkChart(linkMetadata,url,currentID);
}
});
}
......@@ -335,5 +337,9 @@ public class CardBuilder
alert("Excpeiton :: CardBuilder [" + e.message+ "]");
}
}-*/;
public native void openLinkChart( String metadataName, String uri, String currentID )
/*-{
$wnd.getModuleLoad(metadataName, uri, currentID );
}-*/;
/*Added by Chetan mahajan For add dynamic div to existing chart container panel on 1-July-2016*/
}
webitm-dashboard/GWT-Component/src/ibase/client/ChartCreator.java
View file @ 30c31c3d
......@@ -19,7 +19,7 @@ import com.google.gwt.xml.client.XMLParser;
public class ChartCreator
{
public static JSONObject buildChartData(ArrayList<ArrayList<String>> graphDtlList, JSONObject jsonObjGraph, String dataSource,ArrayList<String> parameterList,ArrayList<FilterInfo> filterList)
public static JSONObject buildChartData(ArrayList<ArrayList<String>> graphDtlList, JSONObject jsonObjGraph, String dataSource,ArrayList<String> parameterList,ArrayList<FilterInfo> filterList, String currentID)
{
String key = "";
String currentvalue = "";
......@@ -80,6 +80,8 @@ public class ChartCreator
List<String> parentAxisList=new ArrayList<String>();
/*Ended by Swati on 31-07-15*/
SamePageOpenContainer samePageOpenContainer = null;
for (int i = 0; i < graphDtlList.size(); i++)
{
if (i == 3)
......@@ -185,6 +187,8 @@ public class ChartCreator
allDataList = new ArrayList<LinkedHashMap<JSONValue, JSONValue>>();
String prdFilterName="";
toolTextDataList = new ArrayList<String>();
samePageOpenContainer = new SamePageOpenContainer();
for (FilterInfo filterInfo : filterList)
{
......@@ -496,10 +500,12 @@ public class ChartCreator
String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr="";
String parameterListString=yAxisColunList.get(seriesCnt)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim();
if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
/*if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
{
linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')");
}
}*/
url = propertyStr+"&"+parameterListString+"&CELL_VAL="+cellValue.trim()+"&P1="+urlStr;
linkStringValue = new JSONString("JavaScript:getModuleLoad('"+linkLMetadataList.get(seriesCnt)+"','"+url+"','"+currentID+"');");
}
/*ended code to open new chart in frame by swati 18 Aug 2015*/
//-----end---by swati 30 nov 2015------
......@@ -534,10 +540,14 @@ public class ChartCreator
String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr="";
String parameterListString=yAxisColunList.get(seriesCnt)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim();
if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
/*if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
{
linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')");
}
}*/
url = propertyStr+"&"+parameterListString+"&CELL_VAL="+cellValue.trim()+"&P1="+urlStr;
linkStringValue = new JSONString("JavaScript:getModuleLoad('"+linkLMetadataList.get(seriesCnt)+"','"+url+"','"+currentID+"');");
}
/*ended code to open new chart in frame by swati 18 Aug 2015*/
//-----end--- 30 nov 2015------
......@@ -548,6 +558,7 @@ public class ChartCreator
barDataVal = JSONParser.parseStrict(barValueList.toString().replace('=', ':'));
}
}
CommonUtils.printOnConsole("***** barDataVal ********** :"+barDataVal);
graphJson.put("data", barDataVal);
}
}
......@@ -812,10 +823,12 @@ public class ChartCreator
String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr="";
String parameterListString=yAxisColunList.get(seriesCnt)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim();
if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
/*if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
{
linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')");
}
}*/
url = propertyStr+"&"+parameterListString+"&CELL_VAL="+cellValue.trim()+"&P1="+urlStr;
linkStringValue = new JSONString("JavaScript:getModuleLoad('"+linkLMetadataList.get(seriesCnt)+"','"+url+"','"+currentID+"');");
}
/*ended code to open new chart in frame by swati 18 Aug 2015*/
}
......@@ -848,10 +861,12 @@ public class ChartCreator
String urlStr="";
String parameterListString=yAxisColunList.get(seriesCnt)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim();
String xPlotValue = (""+jsnStringValue).replace('"', ' ').trim();
if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
/*if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
{
linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"','"+xPlotValue+"', 'Y')");
}
}*/
url = propertyStr+"&"+parameterListString+"&CELL_VAL="+cellValue.trim()+"&P1="+urlStr;
linkStringValue = new JSONString("JavaScript:getModuleLoad('"+linkLMetadataList.get(seriesCnt)+"','"+url+"','"+currentID+"');");
}
/*ended code to open new chart in frame by swati 18 Aug 2015*/
}
......
webitm-dashboard/GWT-Component/src/ibase/client/CustomGrid.java
View file @ 30c31c3d
......@@ -2,7 +2,6 @@ package ibase.client;
import ibase.e12ria.e12table.client.AbstractDataGrid;
import ibase.e12ria.e12table.client.ColumnInfoBean;
import ibase.e12ria.e12table.client.DataGridTableRowModel;
......@@ -15,9 +14,11 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
import com.google.gwt.cell.client.TextCell;
import com.google.gwt.core.client.Callback;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.EventTarget;
......@@ -25,6 +26,7 @@ import com.google.gwt.dom.client.TableCellElement;
import com.google.gwt.dom.client.TableRowElement;
import com.google.gwt.dom.client.TableSectionElement;
import com.google.gwt.json.client.JSONObject;
import com.google.gwt.json.client.JSONValue;
import com.google.gwt.user.cellview.client.ColumnSortEvent;
import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
import com.google.gwt.user.cellview.client.Header;
......@@ -39,6 +41,7 @@ import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.view.client.ListDataProvider;
import com.google.gwt.dom.client.Node;
......@@ -60,6 +63,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
private DataGridTableRowModel selDataGridTRModel = null;
HashMap<String, ArrayList<String>> gridPropertyeMap=new HashMap<String, ArrayList<String>>();
String firstIndex="";
String currentID = "";
public CustomGrid(int pageSize) {
super(pageSize);
}
......@@ -78,12 +82,15 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
/*Start code for progess bar to data building- Dhanendra 17Nov2014*/
protected E12LoadingInterface e12LoadImg=new E12LoadingInterface();
/*End code for progess bar to data building- Dhanendra 17Nov2014*/
/*Add currentID Parameter to method by Dhanendra on date 16-09-2016*/
@SuppressWarnings("unchecked")
public FlexTable jsonToArrayList(HashMap<String, HashMap> gridNGraphMeataDataMap,JSONObject jsonObjGridData ,
String dataSrc,String componentId,ArrayList<String> parameterList,ArrayList<FilterInfo> filterList, String firstIndex)
String dataSrc,String componentId,ArrayList<String> parameterList,ArrayList<FilterInfo> filterList, String firstIndex,String currentID)
{
e12LoadImg.setLoadingInfo("Building view...");
e12LoadImg.setLoading(true);
this.currentID = currentID;
DataGridTableRowModel rowDataGrid= null;
E12CustomTextCell.CellData celldata = null;
ArrayList<ColumnInfoBean> dataGridTableColList = new ArrayList<ColumnInfoBean>();
......@@ -578,7 +585,13 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
if(linkFormat.trim().length()>0 && linkFormat.trim().equalsIgnoreCase("F"))
{
/*add height parameter to buildGridFrame by Dhanendra*/
buildGridFrame(metadataName,cellValue, propertyStr,urlStr,parameterListString,dispFilterStatus,height);
/*Comment buildGridFrame method and add code for drill-down dashboard by Dhanendra on date 16-09-2016*/
//buildGridFrame(metadataName,cellValue, propertyStr,urlStr,parameterListString,dispFilterStatus,height);
final String url = propertyStr+"&"+parameterListString+"&CELL_VAL="+cellValue.trim()+"&P1="+urlStr;
SamePageOpenContainer samePageOpenContainer = new SamePageOpenContainer();
samePageOpenContainer.getFrameJSONData(metadataName, url, currentID);
/*Comment buildGridFrame method and add code for drill-down dashboard by Dhanendra on date 16-09-2016*/
}
//P means open url in the new window
if(linkFormat.trim().length()>0 && linkFormat.trim().equalsIgnoreCase("P"))
......@@ -906,4 +919,110 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
}
return true;
}
public void getParameterList(JSONObject metaDataJsnObj,String url,String childID)
{
Date date = new Date();
MetaDataDtl dataDtl = new MetaDataDtl();
filterList =dataDtl.getFilters(metaDataJsnObj);
int year=0;
String month="";
String scmMonth="";
String monthYear="";
year= 1900+date.getYear();
month=String.valueOf(date.getMonth()+1);
scmMonth=String.valueOf((date.getMonth()));
if(month.trim().length()==1)
{
month="0"+month;
}
monthYear=year+month;
int count =0;
if(filterList.size()>0)
{
for (FilterInfo filterInfo : filterList)
{
count++;
//if(count==1)
CommonUtils.printOnConsole("filterInfo.getFieldName() :"+filterInfo.getFieldName());
if(filterInfo.getFieldName().equals("PRD_SALESDASH"))
{
String prdFilterName=filterInfo.getFieldName();
if(prdFilterName=="PRD_SALESDASH")
{
if(scmMonth.trim().length()==1)
{
scmMonth="0"+scmMonth;
}
monthYear=year+scmMonth;
parameterList.add(Window.Location.getParameter(filterInfo.getFieldName()) == null ? monthYear : Window.Location.getParameter(filterInfo.getFieldName()));
}
else
{
parameterList.add(Window.Location.getParameter(filterInfo.getFieldName()) == null ? monthYear : Window.Location.getParameter(filterInfo.getFieldName()));
}
}
/*Add code for current prd code by dhanendra on 06-10-2015 */
else if(filterInfo.getFieldName().equals("CURRENT_PRDCODE"))
{
parameterList.add(Window.Location.getParameter(filterInfo.getFieldName()) == null ? monthYear : Window.Location.getParameter(filterInfo.getFieldName()));
}
/*End code for current prd code by dhanendra on 06-10-2015 */
else
{
//parameterList.add(Window.Location.getParameter(filterInfo.getFieldName()) == null ? "" : Window.Location.getParameter(filterInfo.getFieldName()));
String guess = filterInfo.getFieldName();
CommonUtils.printOnConsole("guess :"+guess);
int wordLgth = guess.length();
CommonUtils.printOnConsole("wordLgth :"+wordLgth);
int index = url.indexOf(guess);
CommonUtils.printOnConsole("index :"+index);
if(index !=-1)
{
String newUri = url.substring(index + 1+wordLgth);
CommonUtils.printOnConsole("newUri :"+newUri);
int parameter = newUri.indexOf("&");
if(parameter == -1 && guess.equals("P1"))
{
parameterList.add(newUri);
}else{
CommonUtils.printOnConsole("parameter :"+parameter);
String paramVal = newUri.substring(0,parameter);
CommonUtils.printOnConsole("paramVal :"+paramVal);
parameterList.add(paramVal == null ? "" : paramVal);
}
CommonUtils.printOnConsole("parameterList in :"+parameterList);
}
else
{
parameterList.add("");
}
}
}
}
/*else
{
parameterList.add(Window.Location.getParameter("metadataname"));
}*/
GWTDashBoardReport boardReport = new GWTDashBoardReport();
parameterList.add(boardReport.getDefaultView(metaDataJsnObj));
CommonUtils.printOnConsole("parameterList :"+parameterList);
E12DashBoardPage e12DashBoardPage = new E12DashBoardPage(parameterList,metaDataJsnObj,childID);
RootPanel.get("filterDiv").add(e12DashBoardPage);
}
/*Add Native method for clear div by Dhanendra on date 19-09-2016*/
private static native void clearDivContainer(String ChartId)
/*-{
try {
$wnd.clearDivOnCloseButton(ChartId);
} catch (e) {
E12CommonUtils.printOnConsole("Exception :: Custom Grid : clearDivOnCloseButton [" + e.message + "]");
}
}-*/;
/*End Native method for clear div by Dhanendra on date 19-09-2016*/
}
webitm-dashboard/GWT-Component/src/ibase/client/E12DashBoardPage.java
View file @ 30c31c3d
......@@ -28,8 +28,8 @@ public class E12DashBoardPage extends Composite
private static GraphComponent graphComponent = null;
public JSONObject metaDataJsnObj = null;
public E12DashBoardPage(ArrayList<String> parameterList, JSONObject metaDataJsnObj)
/*Add childID Parameter to method by Dhanendra on date 16-09-2016*/
public E12DashBoardPage(ArrayList<String> parameterList, JSONObject metaDataJsnObj, String childID)
{
try
{
......@@ -39,14 +39,17 @@ public class E12DashBoardPage extends Composite
mainReportContainer.setWidth("100%");
mainReportContainer.add(graphComponent);
initWidget(mainReportContainer);
initaliseGraphNGrid(parameterList);
/*Add childID Parameter to method by Dhanendra on date 16-09-2016*/
initaliseGraphNGrid(parameterList,childID,metaDataJsnObj);
/*End childID Parameter to method by Dhanendra on date 16-09-2016*/
} catch (Exception e)
{
//Window.alert("Exception :: E12DashBoardPage parametarized constructor [" + e.getMessage() + "]");
}
}
public static void initaliseGraphNGrid(ArrayList<String> parameterList)
/*Add childID Parameter to method by Dhanendra on date 16-09-2016*/
public static void initaliseGraphNGrid(ArrayList<String> parameterList,String childID,JSONObject metaDataJsnObj)
{
graphComponent.getData(new Callback<JSONObject, String>()
{
......@@ -59,7 +62,7 @@ public class E12DashBoardPage extends Composite
{
Window.alert("Exception in initaliseGraphNGrid():: E12DashBoardPage [" + result + "]");
}
}, parameterList);
}, parameterList,childID,metaDataJsnObj);
}
public static void getJsonForFilterData(final Callback<JSONObject, String> callback, String fileName)
......
webitm-dashboard/GWT-Component/src/ibase/client/FilterCreator.java
View file @ 30c31c3d
......@@ -32,6 +32,7 @@ import com.google.gwt.user.client.ui.MenuBar;
import com.google.gwt.user.client.ui.MenuItem;
import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.RadioButton;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
......@@ -746,7 +747,7 @@ public class FilterCreator extends Composite
}
@SuppressWarnings("serial")
private ScrollPanel getViewFilter(final ArrayList<String> parameterList, JSONObject metaDataJsnObj)
private ScrollPanel getViewFilter(final ArrayList<String> parameterList, final JSONObject metaDataJsnObj)
{
ScrollPanel viewPanel = null;
String xmlMetadata = null;
......@@ -797,7 +798,7 @@ public class FilterCreator extends Composite
selectedView = view;
selectedParamList.remove(parameterList.size() - 1);
selectedParamList.add(view);
E12DashBoardPage.initaliseGraphNGrid(selectedParamList);
E12DashBoardPage.initaliseGraphNGrid(selectedParamList,"",metaDataJsnObj);
}
});
fileMenu.addItem(actionItem);
......@@ -1045,7 +1046,8 @@ public class FilterCreator extends Composite
setParameterListDtl(popUpSendDtatListDtl);
/* End add List for India Map Caption Dhanendra 06/05/2015 */
setTitleOnFilterSubmit(popUpSendDtatList, metaDataJsnObj);
E12DashBoardPage.initaliseGraphNGrid(popUpSendDtatList);
CommonUtils.printOnConsole("************ metaDataJsnObj :"+metaDataJsnObj);
E12DashBoardPage.initaliseGraphNGrid(popUpSendDtatList,"",metaDataJsnObj);
}
}
......
webitm-dashboard/GWT-Component/src/ibase/client/GWTDashBoardReport.java
View file @ 30c31c3d
package ibase.client;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import com.google.gwt.core.client.Callback;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.json.client.JSONObject;
......@@ -24,6 +26,10 @@ public class GWTDashBoardReport implements EntryPoint
HorizontalPanel hpanel= new HorizontalPanel();
String metadataname = "";
public String prdFilterName= "";
/*Add variable by Dhanendra */
public static HashMap<String, ArrayList<String>> drillDownIdsMap = new HashMap<String, ArrayList<String>>();
public static boolean isdrillDownDashBoard = false;
/*End variable by Dhanendra */
public void onModuleLoad()
{
metadataname = Window.Location.getParameter("metadataname") == null ? "" : Window.Location.getParameter("metadataname");
......@@ -119,7 +125,8 @@ public class GWTDashBoardReport implements EntryPoint
parameterList.add(Window.Location.getParameter("metadataname"));
}*/
parameterList.add(this.getDefaultView(metaDataJsnObj));
E12DashBoardPage e12DashBoardPage = new E12DashBoardPage(parameterList,metaDataJsnObj);
E12DashBoardPage e12DashBoardPage = new E12DashBoardPage(parameterList,metaDataJsnObj,"");
RootPanel.get("filterDiv").add(e12DashBoardPage);
}
public String getDefaultView(JSONObject metaDataJsnObj)
......
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