Commit a272d28f authored by sbade's avatar sbade

added new code for waiting loading image functionality


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97314 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a1da097e
...@@ -123,6 +123,7 @@ public class ChartCreator ...@@ -123,6 +123,7 @@ public class ChartCreator
} }
//ended by swati on 22 dec 2014 for linkedchart //ended by swati on 22 dec 2014 for linkedchart
} }
int cnt=0; int cnt=0;
if (jsonObjGraph != null) if (jsonObjGraph != null)
{ {
...@@ -258,7 +259,7 @@ public class ChartCreator ...@@ -258,7 +259,7 @@ 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("n-/ibase/dwh/GwtDashboardPage.html?metadataname$pendingorder")); //barChartMap.put(new JSONString("link"), new JSONString("n-/ibase/dwh/GwtDashboardPage.html?metadataname$pendingorder"));
} }
} }
if(! labelList.contains(categoryMap)) if(! labelList.contains(categoryMap))
...@@ -334,12 +335,21 @@ public class ChartCreator ...@@ -334,12 +335,21 @@ public class ChartCreator
url="&titleName$"+url+":"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim(); url="&titleName$"+url+":"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
} }
if((prevUrl).trim().length()>1) if((prevUrl).trim().length()>1)
{ {
linkStringValue=new JSONString("n-"+"/ibase/dwh/GwtDashboardPage.html?metadataname$"+linkLMetadataList.get(seriesCnt)+prevUrl.replace('=', '$')+"&PRD_SALESDASH$"+period+url+"&"+yAxisColunList.get(seriesCnt)+"$"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"$"+(""+jsnStringValue).replace('"', ' ').trim()); if(linkTypeList.get(seriesCnt).trim().equalsIgnoreCase("n")){
linkStringValue=new JSONString(linkTypeList.get(seriesCnt)+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname$"+linkLMetadataList.get(seriesCnt)+prevUrl.replace('=', '$')+"&PRD_SALESDASH$"+period+url+"&"+yAxisColunList.get(seriesCnt)+"$"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"$"+(""+jsnStringValue).replace('"', ' ').trim());
}else if(linkTypeList.get(seriesCnt).trim().equalsIgnoreCase("p")){
linkStringValue=new JSONString(linkTypeList.get(seriesCnt)+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname$"+linkLMetadataList.get(seriesCnt)+prevUrl.replace('=', '$')+"&PRD_SALESDASH$"+period+url+"&"+yAxisColunList.get(seriesCnt)+"$"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"$"+(""+jsnStringValue).replace('"', ' ').trim());
}
} }
else else
{ {
linkStringValue=new JSONString("n-"+"/ibase/dwh/GwtDashboardPage.html?metadataname$"+linkLMetadataList.get(seriesCnt)+"&PRD_SALESDASH$"+period+url+"&"+yAxisColunList.get(seriesCnt)+"$"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"$"+(""+jsnStringValue).replace('"', ' ').trim()); if(linkTypeList.get(seriesCnt).trim().equalsIgnoreCase("n")){
linkStringValue=new JSONString(linkTypeList.get(seriesCnt)+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname$"+linkLMetadataList.get(seriesCnt)+"&PRD_SALESDASH$"+period+url+"&"+yAxisColunList.get(seriesCnt)+"$"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"$"+(""+jsnStringValue).replace('"', ' ').trim());
}
else if(linkTypeList.get(seriesCnt).trim().equalsIgnoreCase("p")){
linkStringValue=new JSONString(linkTypeList.get(seriesCnt)+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname$"+linkLMetadataList.get(seriesCnt)+"&PRD_SALESDASH$"+period+url+"&"+yAxisColunList.get(seriesCnt)+"$"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"$"+(""+jsnStringValue).replace('"', ' ').trim());
}
} }
barChartMap.put(linkStringKey, linkStringValue); barChartMap.put(linkStringKey, linkStringValue);
barChartMap.put(new JSONString("color"), new JSONString(colorInfoList.get(seriesCnt))); barChartMap.put(new JSONString("color"), new JSONString(colorInfoList.get(seriesCnt)));
......
...@@ -68,11 +68,18 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -68,11 +68,18 @@ 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*/
@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); //sample(dataSrc);
//Window.alert("in jsonarray"); //Window.alert("in jsonarray");
e12LoadImg.setLoadingInfo("Building view...");
e12LoadImg.setLoading(true);
DataGridTableRowModel rowDataGrid= null; DataGridTableRowModel rowDataGrid= null;
E12CustomTextCell.CellData celldata = null; E12CustomTextCell.CellData celldata = null;
...@@ -141,6 +148,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -141,6 +148,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
graphCaptionList.add(""+graphCaptioneMap.get("componentCaption"+componentId)); graphCaptionList.add(""+graphCaptioneMap.get("componentCaption"+componentId));
flexTable.setStyleName("flexCSS"); flexTable.setStyleName("flexCSS");
flexTable=createTableComponent(dataGridTableRowList,dataGridTableColList,flexTable,graphAlignList,graphCaptionList); flexTable=createTableComponent(dataGridTableRowList,dataGridTableColList,flexTable,graphAlignList,graphCaptionList);
e12LoadImg.setLoading(false);
} catch (Exception e) } catch (Exception e)
{ {
Window.alert(" Exception : DataGrid : jsonToArrayList(): [" + e.getMessage() + "]"); Window.alert(" Exception : DataGrid : jsonToArrayList(): [" + e.getMessage() + "]");
......
...@@ -57,9 +57,12 @@ public class GraphComponent extends Composite ...@@ -57,9 +57,12 @@ public class GraphComponent extends Composite
* This constructor initializes the graphcontainer * This constructor initializes the graphcontainer
* *
*/ */
/*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*/
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%");
...@@ -250,6 +253,7 @@ public class GraphComponent extends Composite ...@@ -250,6 +253,7 @@ public class GraphComponent extends Composite
} }
} }
} }
e12LoadImg.setLoading(false);
/*}else /*}else
{ {
Window.alert("No Data Found"); Window.alert("No Data Found");
...@@ -279,6 +283,12 @@ public class GraphComponent extends Composite ...@@ -279,6 +283,12 @@ public class GraphComponent extends Composite
public void getDataMap(final LinkedHashMap<String, ArrayList<String>> datsSourceDtlMap) public void getDataMap(final LinkedHashMap<String, ArrayList<String>> datsSourceDtlMap)
{ {
final LinkedHashMap<String, JSONObject> componentDataMap = new LinkedHashMap<String, JSONObject>(); final LinkedHashMap<String, JSONObject> componentDataMap = new LinkedHashMap<String, JSONObject>();
if(parameterList.get(1).trim().length()>0 || parameterList.get(1).trim()!="")
{
e12LoadImg.setLoadingInfo("Waiting For Data...");
e12LoadImg.setLoading(true);
}
ArrayList<FilterInfo> filterList = new MetaDataDtl().getFilters(jsonObjMetaData); ArrayList<FilterInfo> filterList = new MetaDataDtl().getFilters(jsonObjMetaData);
for (Map.Entry<String, ArrayList<String>> entry : datsSourceDtlMap.entrySet()) for (Map.Entry<String, ArrayList<String>> entry : datsSourceDtlMap.entrySet())
{ {
...@@ -422,12 +432,11 @@ public class GraphComponent extends Composite ...@@ -422,12 +432,11 @@ public class GraphComponent extends Composite
} catch (RequestException e) } catch (RequestException e)
{ {
e.printStackTrace(); e.printStackTrace();
e12LoadImg.setLoading(false);
} }
} }
} }
public boolean isNumeric(String s) { public boolean isNumeric(String s) {
return s.matches("[-+]?\\d*\\.?\\d+"); return s.matches("[-+]?\\d*\\.?\\d+");
} }
......
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