Skip to content

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

Added code for Interlink from Stack Chart and parentAxix for bar chart and... 

Added code for Interlink  from Stack Chart and parentAxix for bar chart and add tag showsum in metadata for stack chart .


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98518 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 62c5cec4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 252 deletions
webitm-dashboard/GWT-Component/src/ibase/client/ChartCreator.java
View file @ b869d436
...@@ -404,6 +404,7 @@ public class ChartCreator ...@@ -404,6 +404,7 @@ public class ChartCreator
mapValuList = allDataMap.get(keyString); mapValuList = allDataMap.get(keyString);
jsnStringKey = new JSONString("label"); jsnStringKey = new JSONString("label");
dataStringKey = new JSONString("value"); dataStringKey = new JSONString("value");
dataStringValue = new JSONString(mapValuList.get(0));
String value = mapValuList.get(1).replace("{", ""); String value = mapValuList.get(1).replace("{", "");
value = value.replace("}", ""); value = value.replace("}", "");
String[] tempArray = value.split(","); String[] tempArray = value.split(",");
...@@ -423,7 +424,86 @@ public class ChartCreator ...@@ -423,7 +424,86 @@ public class ChartCreator
if(!barChartMap.containsKey(jsnStringKey)) if(!barChartMap.containsKey(jsnStringKey))
{ {
barChartMap.put(dataStringKey, new JSONString(tempArr[1])); barChartMap.put(dataStringKey, new JSONString(tempArr[1]));
//barChartMap.put(new JSONString("link"), new JSONString("#")); linkStringKey = new JSONString("link");
/*started code link in stack by swati 10 aug 2015*/
String temp = Window.Location.getHref();
String prevUrl = temp.substring(temp.indexOf('&'), temp.length());
String period =parameterList.get(1);
String url=Window.Location.getParameter("titleName");
String prdFilter="";
int cnt1=0;
String propertyStr="";
for (FilterInfo filterInfo : filterList)
{
if(cnt1==0)
{
propertyStr = "&"+filterInfo.getFieldName()+"@"+parameterList.get(cnt1+1);
}
else
{
propertyStr = propertyStr+"&"+filterInfo.getFieldName()+"@"+parameterList.get(cnt1+1);
}
cnt1++;
}
if(prdFilterName.length()>0)
{
prdFilter=prdFilterName;
}
if(url=="undefined" || url.equals("undefined") || url.equalsIgnoreCase("undefined"))
{
url="&titleName@"+(FilterCreator.title).get(0);
}
else
{
url="&titleName@"+url+":"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
}
String linkType=linkTypeList.get(j).trim();
if((prevUrl).trim().length()>1)
{
if(linkType.equalsIgnoreCase("n"))
{
if(linkLMetadataList.get(j).trim().contains("/"))
{
linkStringValue=new JSONString(linkType+"-"+linkLMetadataList.get(j)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}else {
linkStringValue=new JSONString(linkType+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}
}
else if(linkType.equalsIgnoreCase("p"))
{
if(linkLMetadataList.get(j).trim().contains("/"))
{
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+linkLMetadataList.get(j)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}else {
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}
}
}
else
{
if(linkType.equalsIgnoreCase("n"))
{
if(linkLMetadataList.get(j).trim().contains("/"))
{
linkStringValue=new JSONString(linkType+"-"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}else {
linkStringValue=new JSONString(linkType+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}
}
else if(linkType.equalsIgnoreCase("p"))
{
if(linkLMetadataList.get(j).trim().contains("/"))
{
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}else {
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}
}
}
//Window.alert("linkStringKey: "+linkStringKey+"\nlinkStringValue:"+linkStringValue);
/*ended code link in stack by swati 10 aug 2015*/
barChartMap.put(linkStringKey, linkStringValue);
} }
} }
if(! labelList.contains(categoryMap)) if(! labelList.contains(categoryMap))
...@@ -445,7 +525,6 @@ public class ChartCreator ...@@ -445,7 +525,6 @@ public class ChartCreator
} }
} }
barDataVal = JSONParser.parseStrict(barValueList.toString().replace('=', ':')); barDataVal = JSONParser.parseStrict(barValueList.toString().replace('=', ':'));
barMap.put(new JSONString("data"), barDataVal); barMap.put(new JSONString("data"), barDataVal);
allDataList.add(barMap); allDataList.add(barMap);
...@@ -1162,27 +1241,7 @@ public class ChartCreator ...@@ -1162,27 +1241,7 @@ public class ChartCreator
/******start of code for link to new chart*/ /******start of code for link to new chart*/
if(linkedMetadataList.get(cnt).trim().length()>0) if(linkedMetadataList.get(cnt).trim().length()>0)
{ {
/*String temp = Window.Location.getHref();
String prevUrl = temp.substring(temp.indexOf('&'), temp.length());
String period =FilterCreator.parameterList.get(1);
String url=Window.Location.getParameter("titleName");
String prdFilter="";
if(GWTDashBoardReport.prdFilterName.length()>0)
{
prdFilter=GWTDashBoardReport.prdFilterName;
}
if(url=="undefined" || url.equals("undefined") || url.equalsIgnoreCase("undefined"))
{
url="&titleName@"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
}
else
{
url="&titleName@"+url+":"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
}*/
String linkType=linkTypeList.get(cnt).trim(); String linkType=linkTypeList.get(cnt).trim();
//if((prevUrl).trim().length()>1)
//{
if(linkType.equalsIgnoreCase("n")) if(linkType.equalsIgnoreCase("n"))
{ {
if(linkedMetadataList.get(cnt).trim().contains("/")) if(linkedMetadataList.get(cnt).trim().contains("/"))
...@@ -1206,29 +1265,8 @@ public class ChartCreator ...@@ -1206,29 +1265,8 @@ public class ChartCreator
//linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkedMetadataList.get(cnt)+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); //linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkedMetadataList.get(cnt)+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
} }
} }
/*} /*end of code for link to new chart*/
else
{
if(linkType.equalsIgnoreCase("n"))
{
if(linkedMetadataList.get(cnt).trim().contains("/"))
{
linkStringValue=new JSONString(linkType+"-"+linkedMetadataList.get(cnt)+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}else {
linkStringValue=new JSONString(linkType+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkedMetadataList.get(cnt)+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}
}
else if(linkType.equalsIgnoreCase("p"))
{
if(linkedMetadataList.get(cnt).trim().contains("/"))
{
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+linkedMetadataList.get(cnt)+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}else {
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkedMetadataList.get(cnt)+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
}
}
}*/
/*end of code for link to new chatr*/
dataValueJson.put(new JSONString("link"), linkStringValue); dataValueJson.put(new JSONString("link"), linkStringValue);
} }
dataValueJsonList.add(dataValueJson); dataValueJsonList.add(dataValueJson);
......
webitm-dashboard/GWT-Component/src/ibase/client/GraphComponent.java
View file @ b869d436
package ibase.client; package ibase.client;
import java.awt.BufferCapabilities.FlipContents;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -24,7 +22,6 @@ import com.google.gwt.http.client.Response; ...@@ -24,7 +22,6 @@ import com.google.gwt.http.client.Response;
import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONObject;
import com.google.gwt.json.client.JSONParser; import com.google.gwt.json.client.JSONParser;
import com.google.gwt.json.client.JSONString; import com.google.gwt.json.client.JSONString;
import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Composite;
...@@ -916,7 +913,7 @@ public class GraphComponent extends Composite ...@@ -916,7 +913,7 @@ 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);
RootPanel.get("chartContainer").clear(); /*RootPanel.get("chartContainer").clear();*/
}else }else
{ {
componentDataMap.put(key, null); componentDataMap.put(key, null);
...@@ -1014,7 +1011,7 @@ public class GraphComponent extends Composite ...@@ -1014,7 +1011,7 @@ public class GraphComponent extends Composite
if (!"null".equals(groupVal)) if (!"null".equals(groupVal))
{ {
groupVal = groupVal.replace('"', ' '); groupVal = groupVal.replace('"', ' ').trim();
groupVal = groupVal +"@"+ designation; groupVal = groupVal +"@"+ designation;
xAxisVal = "" + fetchRowWiseValJsn.get(xAxixNameList.get(0)).toString().replace('"', ' '); xAxisVal = "" + fetchRowWiseValJsn.get(xAxixNameList.get(0)).toString().replace('"', ' ');
yAxisVal = Integer.parseInt(fetchRowWiseValJsn.get(yAxixNameList.get(0)).toString().replace('"', ' ').trim()); yAxisVal = Integer.parseInt(fetchRowWiseValJsn.get(yAxixNameList.get(0)).toString().replace('"', ' ').trim());
...@@ -1073,8 +1070,8 @@ public class GraphComponent extends Composite ...@@ -1073,8 +1070,8 @@ public class GraphComponent extends Composite
for (int jsnCnt = 0; jsnCnt < dataJsn.size(); jsnCnt++) for (int jsnCnt = 0; jsnCnt < dataJsn.size(); jsnCnt++)
{ {
fetchRowWiseVal = (JSONObject) dataJsn.get(String.valueOf(jsnCnt)); fetchRowWiseVal = (JSONObject) dataJsn.get(String.valueOf(jsnCnt));
group = fetchRowWiseVal.get(groupName).toString().replace("\"", "");
//Window.alert("group :"+group); group = fetchRowWiseVal.get(groupName).toString().replace("\"", "").trim();
if(selcetIndex == null || selcetIndex.equals("")) if(selcetIndex == null || selcetIndex.equals(""))
{ {
if(jsnCnt == 0) if(jsnCnt == 0)
...@@ -1084,7 +1081,7 @@ public class GraphComponent extends Composite ...@@ -1084,7 +1081,7 @@ public class GraphComponent extends Composite
} }
}else }else
{ {
firstValue=selcetIndex; firstValue = selcetIndex;
firstIndex = firstValue; firstIndex = firstValue;
} }
if(group.equalsIgnoreCase(firstValue)) if(group.equalsIgnoreCase(firstValue))
...@@ -1093,7 +1090,6 @@ public class GraphComponent extends Composite ...@@ -1093,7 +1090,6 @@ public class GraphComponent extends Composite
count++; count++;
} }
} }
//Window.alert("In Filter Method :"+fltrDataJson);
return fltrDataJson; return fltrDataJson;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
...@@ -1177,7 +1173,6 @@ public class GraphComponent extends Composite ...@@ -1177,7 +1173,6 @@ public class GraphComponent extends Composite
} }
getClearDiv(groupName); getClearDiv(groupName);
getDisplayData(fltrAfterDataJson, graphDtlList, groupCssList.get(0), width, height, imageName, refrshMapVal, mainDataJson,groupName,filterList); getDisplayData(fltrAfterDataJson, graphDtlList, groupCssList.get(0), width, height, imageName, refrshMapVal, mainDataJson,groupName,filterList);
} }
}else if ("T".equalsIgnoreCase(type)) }else if ("T".equalsIgnoreCase(type))
...@@ -1257,7 +1252,6 @@ public class GraphComponent extends Composite ...@@ -1257,7 +1252,6 @@ public class GraphComponent extends Composite
String[] personArr = null; String[] personArr = null;
String persondesg = ""; String persondesg = "";
for (final String multGrph : mainDataJson.keySet()) for (final String multGrph : mainDataJson.keySet())
{ {
cnt++; cnt++;
......
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