Skip to content

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

Change CSS for container and add summary value for stacksmrt condition 

and rename name for native method for drill down dashboard open in same page.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43217 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 368ef19e
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 18 deletions
webitm-dashboard/GWT-Component/src/ibase/client/CardBuilder.java
View file @ a266387b
...@@ -377,7 +377,7 @@ public class CardBuilder ...@@ -377,7 +377,7 @@ public class CardBuilder
simplePnl.add(cardScrlPnl); simplePnl.add(cardScrlPnl);
//simplePnl.add(verticalPnl); //simplePnl.add(verticalPnl);
/*Added by Dhanendra for call native method */ /*Added by Dhanendra for call native method */
openContainerSamePage(currentID); drillDownInSamePage(currentID);
/*Added by Dhanendra for call native method */ /*Added by Dhanendra for call native method */
return simplePnl; return simplePnl;
} }
...@@ -416,10 +416,10 @@ public class CardBuilder ...@@ -416,10 +416,10 @@ public class CardBuilder
/*Ended by Chetan mahajan For add dynamic div to existing chart container panel on 1-July-2016*/ /*Ended by Chetan mahajan For add dynamic div to existing chart container panel on 1-July-2016*/
/*Add code for open a dill down level dashboard in same page by dhanendra on date 09-03-2017*/ /*Add code for open a dill down level dashboard in same page by dhanendra on date 09-03-2017*/
public native void openContainerSamePage(String currentID) public native void drillDownInSamePage(String currentID)
/*-{ /*-{
var that = this; var that = this;
$wnd.openContainerSamePage = function(linkmetadata,parameters,parentId) $wnd.drillDownInSamePage = function(linkmetadata,parameters,parentId)
{ {
that.@ibase.client.CardBuilder::displayLinkedChart(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(linkmetadata, parameters,parentId, currentID); that.@ibase.client.CardBuilder::displayLinkedChart(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(linkmetadata, parameters,parentId, currentID);
} }
......
webitm-dashboard/GWT-Component/src/ibase/client/GraphComponent.java
View file @ a266387b
...@@ -471,6 +471,8 @@ public class GraphComponent extends Composite ...@@ -471,6 +471,8 @@ public class GraphComponent extends Composite
String currentID = "Graph"+uniqueId+componentId+"Div"; String currentID = "Graph"+uniqueId+componentId+"Div";
CommonUtils.printOnConsole("dataJsn for dataJsonObject :"+dataJsonObject); CommonUtils.printOnConsole("dataJsn for dataJsonObject :"+dataJsonObject);
graphJson = ChartCreator.buildChartData(graphDtlList, dataJsonObject, dtSrouce,parameterList,filterList,currentID,null); graphJson = ChartCreator.buildChartData(graphDtlList, dataJsonObject, dtSrouce,parameterList,filterList,currentID,null);
double summaryValue = ChartCreator.getSubTitleSummary(graphDtlList, dataJsonObject, dtSrouce);
CommonUtils.printOnConsole("summaryValue :"+summaryValue);
CommonUtils.printOnConsole("dataJsn for graphJson :"+graphJson); CommonUtils.printOnConsole("dataJsn for graphJson :"+graphJson);
/*Add Code for Drill-down metadataxml by Dhanendra on date 16-09-2016*/ /*Add Code for Drill-down metadataxml by Dhanendra on date 16-09-2016*/
pageOpenContainer.putIdListInMap(currentID, childID); pageOpenContainer.putIdListInMap(currentID, childID);
...@@ -575,6 +577,22 @@ public class GraphComponent extends Composite ...@@ -575,6 +577,22 @@ public class GraphComponent extends Composite
horizontalPanel.add(componantTtlPanel); horizontalPanel.add(componantTtlPanel);
mainPanel.add(horizontalPanel); mainPanel.add(horizontalPanel);
if(isCompSubTitle)
{
Label subTitleValLabel = new Label(NumberFormat.getInstance().format(summaryValue));
subTitleValLabel.getElement().setId("summaryVal"+uniqueId+componentId);
Label subTitleINRLabel = new Label("INR");
subTitleValLabel.setStyleName("titleValLabel");
subTitleINRLabel.setStyleName("titleValINRLabel");
HorizontalPanel subTitlePanel = new HorizontalPanel();
subTitlePanel.setStyleName("titleValPanel");
subTitlePanel.add(subTitleValLabel);
subTitlePanel.add(subTitleINRLabel);
subTitlePanel.setCellVerticalAlignment(subTitleINRLabel, HasVerticalAlignment.ALIGN_MIDDLE);
mainPanel.add(subTitlePanel);
}
/*Add Code for Drill-down metadataxml by Dhanendra on date 16-09-2016*/ /*Add Code for Drill-down metadataxml by Dhanendra on date 16-09-2016*/
if(!childID.equalsIgnoreCase("")) if(!childID.equalsIgnoreCase(""))
...@@ -2247,8 +2265,11 @@ public class GraphComponent extends Composite ...@@ -2247,8 +2265,11 @@ public class GraphComponent extends Composite
JSONObject dataJsonObject = getReceivableDataJson(dataJsn); JSONObject dataJsonObject = getReceivableDataJson(dataJsn);
graphJson = ChartCreator.buildChartData(graphDtlList, dataJsonObject, dtSrouce,parameterList,filterList,containerIdList.get(countForSmartFilter),selectedDataMap); graphJson = ChartCreator.buildChartData(graphDtlList, dataJsonObject, dtSrouce,parameterList,filterList,containerIdList.get(countForSmartFilter),selectedDataMap);
double summaryValue = ChartCreator.getSubTitleSummary(graphDtlList, dataJsonObject, dtSrouce);
CommonUtils.printOnConsole("summaryValue :"+summaryValue);
String containerId = containerIdList.get(countForSmartFilter).replace("Graph", "").replace("Div", "").trim(); String containerId = containerIdList.get(countForSmartFilter).replace("Graph", "").replace("Div", "").trim();
CommonUtils.printOnConsole("containerId :"+containerId); CommonUtils.printOnConsole("containerId :"+containerId);
RootPanel.get("summaryVal" + containerId).getElement().setInnerText(NumberFormat.getInstance().format(summaryValue));
RootPanel.get("chartContainer" + containerId).clear(); RootPanel.get("chartContainer" + containerId).clear();
this.createChart(graphJson.toString().replace('@', '='), containerId, "chartContainer" + containerId, width, height, imageName,userMail,reportCaption); this.createChart(graphJson.toString().replace('@', '='), containerId, "chartContainer" + containerId, width, height, imageName,userMail,reportCaption);
...@@ -4172,7 +4193,7 @@ public class GraphComponent extends Composite ...@@ -4172,7 +4193,7 @@ public class GraphComponent extends Composite
String cust_code = ""; String cust_code = "";
String cust_codeStr = ""; String cust_codeStr = "";
Set<String> custCodeList = new HashSet<String>();*/ Set<String> custCodeList = new HashSet<String>();*/
long summaryValue = 0;
for (int jsnCnt = 0; jsnCnt < dataJSN.size(); jsnCnt++) for (int jsnCnt = 0; jsnCnt < dataJSN.size(); jsnCnt++)
{ {
fetchRowWiseValJsn = (JSONObject) dataJSN.get(String.valueOf(jsnCnt)); fetchRowWiseValJsn = (JSONObject) dataJSN.get(String.valueOf(jsnCnt));
...@@ -4201,7 +4222,8 @@ public class GraphComponent extends Composite ...@@ -4201,7 +4222,8 @@ public class GraphComponent extends Composite
} }
}*/ }*/
summaryValue = summaryValue + overdue_over_3days + overdue_over_2days + overdue_yesterday + overdue_today +
overdue_tomorrow + overdue_day_after + overdue_rest_of_week + overdue_next_week + overdue_next_month;
} }
JSONObject rawDataOrderStatusSummStackJson = new JSONObject(); JSONObject rawDataOrderStatusSummStackJson = new JSONObject();
...@@ -4217,6 +4239,7 @@ public class GraphComponent extends Composite ...@@ -4217,6 +4239,7 @@ public class GraphComponent extends Composite
rawJson.put("date", new JSONString(""+count)); rawJson.put("date", new JSONString(""+count));
rawJson.put("status",new JSONString("Overdue over 3days")); rawJson.put("status",new JSONString("Overdue over 3days"));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString("0"));
//JSONObject servletJsnObj = (JSONObject) JSONParser.parseStrict(catValues.toString()); //JSONObject servletJsnObj = (JSONObject) JSONParser.parseStrict(catValues.toString());
//rawJson.put("category_value",servletJsnObj); //rawJson.put("category_value",servletJsnObj);
...@@ -4231,6 +4254,7 @@ public class GraphComponent extends Composite ...@@ -4231,6 +4254,7 @@ public class GraphComponent extends Composite
rawJson.put("status",new JSONString("Overdue over 2days")); rawJson.put("status",new JSONString("Overdue over 2days"));
//rawJson.put("category_value",new JSONString(""+catValues)); //rawJson.put("category_value",new JSONString(""+catValues));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString("0"));
rawDataOrderStatusSummStackJson.put(""+count, rawJson); rawDataOrderStatusSummStackJson.put(""+count, rawJson);
count++; count++;
...@@ -4242,6 +4266,7 @@ public class GraphComponent extends Composite ...@@ -4242,6 +4266,7 @@ public class GraphComponent extends Composite
rawJson.put("status",new JSONString("Overdue yesterday")); rawJson.put("status",new JSONString("Overdue yesterday"));
//rawJson.put("category_value",new JSONString(""+catValues)); //rawJson.put("category_value",new JSONString(""+catValues));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString("0"));
rawDataOrderStatusSummStackJson.put(""+count, rawJson); rawDataOrderStatusSummStackJson.put(""+count, rawJson);
count++; count++;
...@@ -4252,6 +4277,7 @@ public class GraphComponent extends Composite ...@@ -4252,6 +4277,7 @@ public class GraphComponent extends Composite
rawJson.put("date", new JSONString(""+count)); rawJson.put("date", new JSONString(""+count));
rawJson.put("status",new JSONString("Overdue today")); rawJson.put("status",new JSONString("Overdue today"));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString("0"));
//rawJson.put("category_value",new JSONString(""+catValues)); //rawJson.put("category_value",new JSONString(""+catValues));
rawDataOrderStatusSummStackJson.put(""+count, rawJson); rawDataOrderStatusSummStackJson.put(""+count, rawJson);
count++; count++;
...@@ -4264,6 +4290,7 @@ public class GraphComponent extends Composite ...@@ -4264,6 +4290,7 @@ public class GraphComponent extends Composite
rawJson.put("status",new JSONString("Overdue tomorrow")); rawJson.put("status",new JSONString("Overdue tomorrow"));
//rawJson.put("category_value",new JSONString(""+catValues)); //rawJson.put("category_value",new JSONString(""+catValues));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString("0"));
rawDataOrderStatusSummStackJson.put(""+count, rawJson); rawDataOrderStatusSummStackJson.put(""+count, rawJson);
count++; count++;
...@@ -4275,6 +4302,7 @@ public class GraphComponent extends Composite ...@@ -4275,6 +4302,7 @@ public class GraphComponent extends Composite
rawJson.put("status",new JSONString("Overdue day after")); rawJson.put("status",new JSONString("Overdue day after"));
//rawJson.put("category_value",new JSONString(""+catValues)); //rawJson.put("category_value",new JSONString(""+catValues));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString("0"));
rawDataOrderStatusSummStackJson.put(""+count, rawJson); rawDataOrderStatusSummStackJson.put(""+count, rawJson);
count++; count++;
...@@ -4286,6 +4314,7 @@ public class GraphComponent extends Composite ...@@ -4286,6 +4314,7 @@ public class GraphComponent extends Composite
rawJson.put("status",new JSONString("Overdue rest of week")); rawJson.put("status",new JSONString("Overdue rest of week"));
//rawJson.put("category_value",new JSONString(""+catValues)); //rawJson.put("category_value",new JSONString(""+catValues));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString("0"));
rawDataOrderStatusSummStackJson.put(""+count, rawJson); rawDataOrderStatusSummStackJson.put(""+count, rawJson);
count++; count++;
...@@ -4297,6 +4326,7 @@ public class GraphComponent extends Composite ...@@ -4297,6 +4326,7 @@ public class GraphComponent extends Composite
rawJson.put("status",new JSONString("Overdue next week")); rawJson.put("status",new JSONString("Overdue next week"));
//rawJson.put("category_value",new JSONString(""+catValues)); //rawJson.put("category_value",new JSONString(""+catValues));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString("0"));
rawDataOrderStatusSummStackJson.put(""+count, rawJson); rawDataOrderStatusSummStackJson.put(""+count, rawJson);
count++; count++;
...@@ -4308,6 +4338,7 @@ public class GraphComponent extends Composite ...@@ -4308,6 +4338,7 @@ public class GraphComponent extends Composite
rawJson.put("status",new JSONString("Overdue next month")); rawJson.put("status",new JSONString("Overdue next month"));
//rawJson.put("category_value",new JSONString(""+catValues)); //rawJson.put("category_value",new JSONString(""+catValues));
rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":"))); rawJson.put("category_value",new JSONString(catValues.toString().replace("=", ":")));
rawJson.put("summaryval", new JSONString(""+summaryValue));
rawDataOrderStatusSummStackJson.put(""+count, rawJson); rawDataOrderStatusSummStackJson.put(""+count, rawJson);
count++; count++;
......
webitm-dashboard/GWT-Component/war/GwtDashboardPage.css
View file @ a266387b
...@@ -21,7 +21,8 @@ td{ ...@@ -21,7 +21,8 @@ td{
.outerChartContainer .outerChartContainer
{ {
/* width:99%; */ /* width:99%; */
width:97.5%; /* width:97.5%; */
width:95%;
/* padding:0.5%; */ /* padding:0.5%; */
position:relative; position:relative;
float:left; float:left;
...@@ -40,7 +41,8 @@ td{ ...@@ -40,7 +41,8 @@ td{
} }
.outerChartContainerPos1of1 .outerChartContainerPos1of1
{ {
width:97.5%; /* width:97.5%; */
width:95%;
/* padding:0.5%; */ /* padding:0.5%; */
position:relative; position:relative;
/* margin:0.5%; */ /* margin:0.5%; */
...@@ -62,7 +64,8 @@ td{ ...@@ -62,7 +64,8 @@ td{
} }
.outerChartContainerPos1of2 .outerChartContainerPos1of2
{ {
width:48%; /* width:48%; */
width:46%;
/* padding:0.5%; */ /* padding:0.5%; */
position:relative; position:relative;
float:left; float:left;
...@@ -120,14 +123,15 @@ td{ ...@@ -120,14 +123,15 @@ td{
width: 31.5%; width: 31.5%;
position: relative; position: relative;
float: left; float: left;
MARGIN-TOP: 20PX; MARGIN-TOP: 15PX;
MARGIN-LEFT: 16PX; MARGIN-LEFT: 15PX;
-webkit-box-shadow: -1px 0px 7px 1px rgba(153,145,153,0.77); -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); -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); box-shadow: -1px 0px 7px 1px rgba(153,145,153,0.77);
background-color: #fff; background-color: #fff;
MIN-WIDTH: 309PX; MIN-WIDTH: 309PX;
overflow-y:hidden; overflow-y:hidden;
margin-bottom: 15px;
} }
.chartContainerHead .chartContainerHead
...@@ -190,7 +194,7 @@ td{ ...@@ -190,7 +194,7 @@ td{
.refreshDateTime .refreshDateTime
{ {
font-size:12px; font-size:12px;
text-align:right; /* text-align:right; */
color:#999; color:#999;
/* margin-top: 3px; */ /* margin-top: 3px; */
margin-left: 5px; margin-left: 5px;
...@@ -1408,7 +1412,7 @@ color: #999; !important; ...@@ -1408,7 +1412,7 @@ color: #999; !important;
/*Add CSS for SmartFilter on Date 28-08-15*/ /*Add CSS for SmartFilter on Date 28-08-15*/
.outerChartContainerSmtFltr1of1 .outerChartContainerSmtFltr1of1
{ {
width:82%; width:67%;
position:relative; position:relative;
/* MARGIN-TOP: 20PX; */ /* MARGIN-TOP: 20PX; */
MARGIN-LEFT: 20PX; MARGIN-LEFT: 20PX;
...@@ -1933,7 +1937,7 @@ width:26%; ...@@ -1933,7 +1937,7 @@ width:26%;
{ {
position: absolute; position: absolute;
top: 8%; top: 8%;
left: 84%; left: 71%;
} }
.bubbleChartDiv .bubbleChartDiv
{ {
...@@ -2006,7 +2010,7 @@ width:26%; ...@@ -2006,7 +2010,7 @@ width:26%;
{ {
padding: 5px; padding: 5px;
margin-left: 5px; margin-left: 5px;
font-size: 28px; font-size: 21px;
} }
.refreshIcon .refreshIcon
{ {
...@@ -2018,7 +2022,8 @@ width:26%; ...@@ -2018,7 +2022,8 @@ width:26%;
{ {
color: #999; color: #999;
margin-top: 46%; margin-top: 46%;
font-size: 12px; font-size: 10px;
margin-right: 5px;
} }
.titleValPanel .titleValPanel
{ {
...@@ -2029,7 +2034,8 @@ width:26%; ...@@ -2029,7 +2034,8 @@ width:26%;
/*Add css class for drill down level dashboard for change border color by dhanendra on date 01-03-2017*/ /*Add css class for drill down level dashboard for change border color by dhanendra on date 01-03-2017*/
.outerChartContainerPos1of1drilldown .outerChartContainerPos1of1drilldown
{ {
width:97.5%; /* width:97.5%; */
width:95%;
position:relative; position:relative;
MARGIN-TOP: -10PX; MARGIN-TOP: -10PX;
MARGIN-LEFT: 20PX; MARGIN-LEFT: 20PX;
...@@ -2041,7 +2047,8 @@ width:26%; ...@@ -2041,7 +2047,8 @@ width:26%;
} }
.outerChartContainerDrillDown .outerChartContainerDrillDown
{ {
width:97.5%; /* width:97.5%; */
width:95%;
position:relative; position:relative;
float:left; float:left;
background-color: #fff; background-color: #fff;
...@@ -2052,7 +2059,7 @@ width:26%; ...@@ -2052,7 +2059,7 @@ width:26%;
} }
.outerChartContainerSmtFltr1of1drilldown .outerChartContainerSmtFltr1of1drilldown
{ {
width:82%; width:67%;
position:relative; position:relative;
MARGIN-TOP: -10PX; MARGIN-TOP: -10PX;
MARGIN-LEFT: 20PX; MARGIN-LEFT: 20PX;
......
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