Commit ff9a7c96 authored by sbade's avatar sbade

Added updated client source file for GWT component


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96896 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 19d4d6e0
...@@ -4,6 +4,7 @@ import java.util.ArrayList; ...@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.HashMap; 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.Set; import java.util.Set;
import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONObject;
...@@ -126,13 +127,14 @@ public class ChartCreator ...@@ -126,13 +127,14 @@ public class ChartCreator
currentvalue = (fetchRowWiseVal.get(yAxisColunList.get(yCnt)).toString().replace('"', ' ').trim()); currentvalue = (fetchRowWiseVal.get(yAxisColunList.get(yCnt)).toString().replace('"', ' ').trim());
valueList.add(currentvalue); valueList.add(currentvalue);
} }
allDataMap.put(key, valueList); allDataMap.put(key, valueList);
key = ""; key = "";
} }
valueMapSet = allDataMap.keySet(); valueMapSet = allDataMap.keySet();
if(chartTypeList.get(0).trim().equals("bar")) if(chartTypeList.get(0).trim().equals("bar"))
{ {
for (String keyString : valueMapSet) for (String keyString : valueMapSet)
{ {
mapValuList = allDataMap.get(keyString); mapValuList = allDataMap.get(keyString);
...@@ -208,8 +210,61 @@ public class ChartCreator ...@@ -208,8 +210,61 @@ public class ChartCreator
} }
} }
if(chartTypeList.get(0).trim().equals("stack"))
{
HashMap<String, String> dMap = new HashMap<String, String>();
for (String keyString : valueMapSet)
{
mapValuList = allDataMap.get(keyString);
jsnStringKey = new JSONString("label");
dataStringKey = new JSONString("value");
String value = mapValuList.get(1).replace("{", "");
value = value.replace("}", "");
String[] tempArray = value.split(",");
barMap = new LinkedHashMap<JSONValue, JSONValue>();
barValueList = new ArrayList<LinkedHashMap<JSONValue, JSONValue>>();
for(int i=0;i<tempArray.length;i++)
{
if(! tempArray[i].equals(""))
{
String[] tempArr = tempArray[i].split(":");
categoryMap = new LinkedHashMap<JSONValue, JSONValue>();
barChartMap = new LinkedHashMap<JSONValue, JSONValue>();
for(int j=0;j<tempArr.length;j++)
{
jsnStringValue = new JSONString(tempArr[0]);
categoryMap.put(jsnStringKey, jsnStringValue);
if(!barChartMap.containsKey(jsnStringKey))
{
barChartMap.put(dataStringKey, new JSONString(tempArr[1]));
}
}
if(! labelList.contains(categoryMap))
{
labelList.add(categoryMap);
}
if(! barValueList.contains(categoryMap))
{
barValueList.add(barChartMap);
}
}
}
barMap.put(new JSONString("seriesname"), new JSONString(mapValuList.get(0)));
barDataVal = JSONParser.parseStrict(barValueList.toString().replace('=', ':'));
barMap.put(new JSONString("data"), barDataVal);
allDataList.add(barMap);
graphJson.put("dataset", JSONParser.parseStrict(allDataList.toString().replace('=', ':')));
}
categryDataVal = JSONParser.parseStrict(labelList.toString().replace('=', ':'));
categryJson.put("category", categryDataVal);
graphJson.put("categories", categryJson);
}
jsonChartVal = JSONParser.parseStrict(metaDataList.toString()); jsonChartVal = JSONParser.parseStrict(metaDataList.toString());
graphJson.put("chart", jsonChartVal); graphJson.put("chart", jsonChartVal);
//Window.alert("graphJson:"+graphJson);
} catch (Exception e) } catch (Exception e)
{ {
Window.alert(" Exception :: Build Final Graph component [" + e.getMessage() + "]"); Window.alert(" Exception :: Build Final Graph component [" + e.getMessage() + "]");
......
...@@ -10,8 +10,6 @@ import ibase.e12ria.e12table.client.E12CustomTextCell; ...@@ -10,8 +10,6 @@ import ibase.e12ria.e12table.client.E12CustomTextCell;
import ibase.e12ria.e12table.client.ResizableHeader; import ibase.e12ria.e12table.client.ResizableHeader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.TreeMap; import java.util.TreeMap;
...@@ -19,11 +17,9 @@ import com.google.gwt.cell.client.TextCell; ...@@ -19,11 +17,9 @@ import com.google.gwt.cell.client.TextCell;
import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT;
import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeEvent;
import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.event.logical.shared.ResizeHandler;
import com.google.gwt.i18n.shared.DateTimeFormat;
import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONObject;
import com.google.gwt.user.cellview.client.ColumnSortEvent; import com.google.gwt.user.cellview.client.ColumnSortEvent;
import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
import com.google.gwt.user.cellview.client.E12SimplePager;
import com.google.gwt.user.cellview.client.Header; import com.google.gwt.user.cellview.client.Header;
import com.google.gwt.user.cellview.client.SimplePager; import com.google.gwt.user.cellview.client.SimplePager;
import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Command;
...@@ -33,9 +29,9 @@ import com.google.gwt.user.client.ui.FlexTable; ...@@ -33,9 +29,9 @@ import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.ListDataProvider;
import com.google.gwt.xml.client.Node;
/** /**
* This class is used to show the data in paged format. * This class is used to show the data in paged format.
* *
...@@ -75,7 +71,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -75,7 +71,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
@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)
{ {
//Window.alert("in jsonarray");
DataGridTableRowModel rowDataGrid= null; DataGridTableRowModel rowDataGrid= null;
E12CustomTextCell.CellData celldata = null; E12CustomTextCell.CellData celldata = null;
...@@ -107,15 +103,18 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -107,15 +103,18 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
graphDtlList = graphDataMap.get(graphKey); graphDtlList = graphDataMap.get(graphKey);
jsonEachRow = new JSONObject(); jsonEachRow = new JSONObject();
jsonEachRow = (JSONObject)jsonObjData.get(""+jRowCtr); jsonEachRow = (JSONObject)jsonObjData.get(""+jRowCtr);
// Window.alert("jsonEachRow:"+jsonEachRow);
count=rowData.size(); count=rowData.size();
for(int jDataCtr=0;jDataCtr<graphDtlList.size();jDataCtr++) for(int jDataCtr=0;jDataCtr<graphDtlList.size();jDataCtr++)
{ {
celldata = new E12CustomTextCell.CellData((""+jsonEachRow.get(""+graphDtlList.get(jDataCtr))).replace('"', ' ')); celldata = new E12CustomTextCell.CellData((""+jsonEachRow.get(""+graphDtlList.get(jDataCtr))).replace('"', ' '));
celldata.setMandatory(true); celldata.setMandatory(true);
celldata.setOriginalText("Cell"+jDataCtr); celldata.setOriginalText("Cell"+jDataCtr);
celldata.setName(""+(graphDtlList.get(jDataCtr)).replace('"', ' ')); celldata.setName(""+(graphDtlList.get(jDataCtr)).replace('"', ' '));
rowData.put(count, celldata); rowData.put(count, celldata);
count++; count++;
} }
} }
rowDataGrid = new DataGridTableRowModel(rowData); rowDataGrid = new DataGridTableRowModel(rowData);
...@@ -177,7 +176,8 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -177,7 +176,8 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
final ListHandler<DataGridTableRowModel> sortHandler = new ListHandler<DataGridTableRowModel>( dataProvider.getList()) final ListHandler<DataGridTableRowModel> sortHandler = new ListHandler<DataGridTableRowModel>( dataProvider.getList())
{ {
@Override @Override
public void onColumnSort(ColumnSortEvent event) { public void onColumnSort(ColumnSortEvent event)
{
super.onColumnSort(event); super.onColumnSort(event);
dataProvider.refresh(); dataProvider.refresh();
} }
...@@ -186,7 +186,6 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -186,7 +186,6 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
int width = 0; int width = 0;
for( int i= 0 ; i < noOfColumns ; i++ ) for( int i= 0 ; i < noOfColumns ; i++ )
{ {
final int index = i;
ColumnInfoBean colInfo = dataGridTableColList.get( i ); ColumnInfoBean colInfo = dataGridTableColList.get( i );
final String colName = colInfo.getDisplayNameOfCol(); final String colName = colInfo.getDisplayNameOfCol();
width = colInfo.getWidth(); width = colInfo.getWidth();
...@@ -208,7 +207,6 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -208,7 +207,6 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
{ {
firstColumn = column; firstColumn = column;
} }
final String dispDate ="12/12/2014";
this.setColumnWidth( column, width +"px" ); this.setColumnWidth( column, width +"px" );
header = new ResizableHeader<DataGridTableRowModel>(colName, this, column ) { header = new ResizableHeader<DataGridTableRowModel>(colName, this, column ) {
@Override @Override
...@@ -254,6 +252,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -254,6 +252,7 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
final SimplePager displayPager = new SimplePager(SimplePager.TextLocation.CENTER, displayPagerResources, false, 0 , true, excelBtnPnl); final SimplePager displayPager = new SimplePager(SimplePager.TextLocation.CENTER, displayPagerResources, false, 0 , true, excelBtnPnl);
displayPager.setDisplay(this); displayPager.setDisplay(this);
displayPager.setRangeText(rangeText); displayPager.setRangeText(rangeText);
Label labelNoDataFound = new Label("No Data Found");
Command setRowCmd = new Command() { Command setRowCmd = new Command() {
@Override @Override
public void execute() public void execute()
...@@ -285,7 +284,16 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -285,7 +284,16 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
if(caption.trim().length()!=0) if(caption.trim().length()!=0)
{ {
flexTable.setText(0, 0, caption); flexTable.setText(0, 0, caption);
if(noOfRows<=0)
{
flexTable.setWidget(1, 0, labelNoDataFound);
}else
{
flexTable.setWidget(1, 0, this); flexTable.setWidget(1, 0, this);
}
//flexTable.setWidget(1, 0, this);
flexTable.setWidget(2, 0, displayPager); flexTable.setWidget(2, 0, displayPager);
flexTable.getCellFormatter().setStyleName(0 ,0 , "FlexTable-ColumnHeaderCell"); flexTable.getCellFormatter().setStyleName(0 ,0 , "FlexTable-ColumnHeaderCell");
flexTable.getCellFormatter().setStyleName(1 ,0 , "gwt-ScrollTable"); flexTable.getCellFormatter().setStyleName(1 ,0 , "gwt-ScrollTable");
...@@ -299,9 +307,17 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -299,9 +307,17 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
flexTable.getCellFormatter().setStyleName(2 ,0 , "e12Pager-forIE"); flexTable.getCellFormatter().setStyleName(2 ,0 , "e12Pager-forIE");
} }
}else
{
if(noOfRows<=0)
{
flexTable.setWidget(0, 0, labelNoDataFound);
}else }else
{ {
flexTable.setWidget(0, 0, this); flexTable.setWidget(0, 0, this);
}
//flexTable.setWidget(0, 0, this);
flexTable.setWidget(1, 0, displayPager); flexTable.setWidget(1, 0, displayPager);
flexTable.getCellFormatter().setStyleName(0 ,0 , "gwt-ScrollTable"); flexTable.getCellFormatter().setStyleName(0 ,0 , "gwt-ScrollTable");
...@@ -315,27 +331,18 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel> ...@@ -315,27 +331,18 @@ public class CustomGrid extends AbstractDataGrid<DataGridTableRowModel>
} }
} }
flexTable.setHeight( Window.getClientHeight() - 195 + "px" ); /*flexTable.setHeight( Window.getClientHeight() - 195 + "px" );
setHeight( Window.getClientHeight() - 207+ "px" ); setHeight( Window.getClientHeight() - 240+ "px" );
setHeight( ( ( Window.getClientHeight() - 207 ))+ "px" ); setHeight( ( ( Window.getClientHeight() - 250 ))+ "px" );*/
flexTable.setHeight("330px");
setHeight("330px");
/*flexTable.setText(0, 0, caption); /*flexTable.setHeight( Window.getClientHeight() - 225 + "px" );
flexTable.setWidget(1, 0, this); setHeight( Window.getClientHeight() - 207+ "px" );
flexTable.setWidget(2, 0, displayPager); setHeight( ( ( Window.getClientHeight() - 215 ))+ "px" );*/
//flexTable.setWidth( Window.getClientWidth() -10+ "px" ); //flexTable.setHeight("320px");
//flexTable.setWidth("100% !important"); //setHeight( ( ( Window.getClientHeight() - 350 ))+ "px" );
flexTable.getCellFormatter().setStyleName(0 ,0 , "FlexTable-ColumnHeaderCell"); //addStyleName("e12AdvDataGrid-SideBars");
flexTable.getCellFormatter().setStyleName(1 ,0 , "gwt-ScrollTable");
//flexTable.getCellFormatter().setStyleName(1 ,0 , "e12Pager");
if( GridThemes.getBrowserVersion() == -1 )
{
flexTable.getCellFormatter().setStyleName(2 ,0 , "e12Pager");
}
else
{
flexTable.getCellFormatter().setStyleName(2 ,0 , "e12Pager-forIE");
}*/
addStyleName("e12AdvDataGrid-SideBars");
return flexTable; return flexTable;
} }
......
...@@ -6,6 +6,9 @@ import java.util.Map; ...@@ -6,6 +6,9 @@ import java.util.Map;
import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.http.client.Request; import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback; import com.google.gwt.http.client.RequestCallback;
...@@ -28,7 +31,6 @@ import com.google.gwt.user.client.ui.MenuItem; ...@@ -28,7 +31,6 @@ import com.google.gwt.user.client.ui.MenuItem;
import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.RadioButton;
import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.SuggestBox;
import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.Widget;
...@@ -55,6 +57,8 @@ public class FilterCreator extends Composite ...@@ -55,6 +57,8 @@ public class FilterCreator extends Composite
ArrayList<String> title = new ArrayList<String>(); ArrayList<String> title = new ArrayList<String>();
ArrayList<String> parameterList = null; ArrayList<String> parameterList = null;
HorizontalPanel headingLableImgPanel = new HorizontalPanel(); HorizontalPanel headingLableImgPanel = new HorizontalPanel();
String windowTitle = "Title";
public FilterCreator(ArrayList<String> parameterList, JSONObject metaDataJsnObj) public FilterCreator(ArrayList<String> parameterList, JSONObject metaDataJsnObj)
{ {
this.parameterList = parameterList; this.parameterList = parameterList;
...@@ -67,12 +71,11 @@ public class FilterCreator extends Composite ...@@ -67,12 +71,11 @@ public class FilterCreator extends Composite
} else } else
{ {
//label.setText(title.get(0) + parameterList.get(2) + "-" + parameterList.get(3)); //label.setText(title.get(0) + parameterList.get(2) + "-" + parameterList.get(3));
label.setText(title.get(0) + parameterList.get(1)) ;//+ "-" + parameterList.get(2)); label.setText(title.get(0) );//+ parameterList.get(1));//+ "-" + parameterList.get(2));
} }
HeadingLableImg.setStyleName("filterImage"); HeadingLableImg.setStyleName("filterImage");
if(getViewFilter(parameterList, metaDataJsnObj)!=null) if (getViewFilter(parameterList, metaDataJsnObj) != null)
{ {
headingLableImgPanel.add(getViewFilter(parameterList, metaDataJsnObj)); headingLableImgPanel.add(getViewFilter(parameterList, metaDataJsnObj));
} }
...@@ -125,7 +128,6 @@ public class FilterCreator extends Composite ...@@ -125,7 +128,6 @@ public class FilterCreator extends Composite
{ {
final ArrayList<FilterInfo> filterList = new MetaDataDtl().getFilters(metaDataJsnObj); final ArrayList<FilterInfo> filterList = new MetaDataDtl().getFilters(metaDataJsnObj);
final PopupPanel mainPopupPnl = new PopupPanel(true); final PopupPanel mainPopupPnl = new PopupPanel(true);
VerticalPanel homePgFltrPopupVPnl = new VerticalPanel(); VerticalPanel homePgFltrPopupVPnl = new VerticalPanel();
HorizontalPanel finishCancelBtnsHPnl = new HorizontalPanel(); HorizontalPanel finishCancelBtnsHPnl = new HorizontalPanel();
Label headinglable = new Label("Analysis Scope"); Label headinglable = new Label("Analysis Scope");
...@@ -140,11 +142,10 @@ public class FilterCreator extends Composite ...@@ -140,11 +142,10 @@ public class FilterCreator extends Composite
int noOfFiltr = 0; int noOfFiltr = 0;
Label columnNameLbl = null; Label columnNameLbl = null;
popUpHPnl.setSpacing(5); popUpHPnl.setSpacing(5);
if((parameterList==null) || (parameterList!=null && parameterList.size()<=4)) if ((parameterList == null) || (parameterList != null && parameterList.size() <= 4))
{ {
homePgFltrPopupVPnl.setStylePrimaryName("fltrPopupVPnlWidthFixed"); homePgFltrPopupVPnl.setStylePrimaryName("fltrPopupVPnlWidthFixed");
} } else
else
{ {
homePgFltrPopupVPnl.setStylePrimaryName("fltrPopupVPnl"); homePgFltrPopupVPnl.setStylePrimaryName("fltrPopupVPnl");
} }
...@@ -255,111 +256,72 @@ public class FilterCreator extends Composite ...@@ -255,111 +256,72 @@ public class FilterCreator extends Composite
} }
}); });
//finishBtn.addClickHandler(new ClickHandler() /* Added new Code for Enter Key Action on 12 Nov 2014 by Dhanendra */
finishimage.addClickHandler(new ClickHandler()
{
@Override
public void onClick(ClickEvent event)
{
int row = 0;
FlexTable grid = null;
CheckBox checkBox = null;
TextBox fltrTxtBox = null;
SuggestBox suggestBox = null;
ScrollPanel scrollPnl = null;
ArrayList<String> popUpSendDtatList = new ArrayList<String>();
FilterInfo fltrInfo = null;
String colName = "";
popUpSendDtatList.add(xmlName);
for (int i = 0; i < filterList.size(); i++)
{
fltrInfo = filterList.get(i);
colName = fltrInfo.getColName();
for (int scrlPnlCnt = 0; scrlPnlCnt < popUpHPnl.getWidgetCount(); scrlPnlCnt++)
{
if (popUpHPnl.getWidget(scrlPnlCnt) instanceof VerticalPanel)
{
VerticalPanel verticalPanel = (VerticalPanel) popUpHPnl.getWidget(scrlPnlCnt);
if (verticalPanel.getWidget(1) instanceof HorizontalPanel)
{
HorizontalPanel horizontalPanel = (HorizontalPanel) verticalPanel.getWidget(1);
if (horizontalPanel.getWidget(0) instanceof ScrollPanel)
{
scrollPnl = (ScrollPanel) horizontalPanel.getWidget(0);
StringBuffer selectedChkBoxBuffer = new StringBuffer();
grid = (FlexTable) scrollPnl.getWidget();
row = grid.getRowCount();
for (int rowCnt = 1; rowCnt < row; rowCnt++)
{
checkBox = (CheckBox) grid.getWidget(rowCnt, 0);
if (checkBox.getValue())
{
if (selectedChkBoxBuffer.length() != 0)
{
selectedChkBoxBuffer.append("," + grid.getText(rowCnt, 1).trim());
} else
{
selectedChkBoxBuffer.append(grid.getText(rowCnt, 1).trim());
}
}
}
if (scrollPnl.getTitle().equals(colName))
{
popUpSendDtatList.add(selectedChkBoxBuffer.toString());
}
} else if (horizontalPanel.getWidget(0) instanceof TextBox) mainPopupPnl.addDomHandler(new KeyUpHandler()
{ {
fltrTxtBox = (TextBox) horizontalPanel.getWidget(0); public void onKeyUp(KeyUpEvent event)
if (fltrTxtBox.getTitle().equals(colName))
{ {
if (!fltrTxtBox.getText().isEmpty()) int keyCode = event.getNativeKeyCode();
if (keyCode == KeyCodes.KEY_ENTER)
{ {
popUpSendDtatList.add(fltrTxtBox.getText()); //Window.alert("Title is =" + Window.getTitle());
} else if (!Window.getTitle().equalsIgnoreCase(windowTitle))
{ {
Window.alert(fltrInfo.getColName() + "Can't Be Empty"); getFltrSelectedData(filterList, mainPopupPnl);
}
} }
} else if (popUpHPnl.getWidget(scrlPnlCnt) instanceof SuggestBox) else
{
suggestBox = (SuggestBox) popUpHPnl.getWidget(scrlPnlCnt);
if (suggestBox.getTitle().equals(colName))
{
if (!suggestBox.getText().isEmpty())
{
popUpSendDtatList.add(suggestBox.getText());
} else
{ {
Window.alert(fltrInfo.getColName() + "Can't Be Empty"); Window.setTitle("");
}
}
}
}
} }
} }
} }
mainPopupPnl.hide(); }, KeyUpEvent.getType());
/*if (title.size() > 1)
/* Ended new Code for Enter Key Action on 12 Nov 2014 by Dhanendra */
finishimage.addClickHandler(new ClickHandler()
{ {
label.setText(title.get(0) + " " + getMonth(popUpSendDtatList.get(1)) + title.get(1) + getMonth(popUpSendDtatList.get(2))); @Override
} else public void onClick(ClickEvent event)
{ {
label.setText(title.get(0) + popUpSendDtatList.get(2) + "-" + popUpSendDtatList.get(3));
}*/ getFltrSelectedData(filterList, mainPopupPnl);
popUpSendDtatList.add(selectedView);
setParameterList(popUpSendDtatList);
E12DashBoardPage.initaliseGraphNGrid(popUpSendDtatList);
} }
}); });
} }
public void getPopHelpString(final HorizontalPanel popUpHPnl, final FilterInfo filterInfo, final String[] splitedArray) public void getPopHelpString(final HorizontalPanel popUpHPnl, final FilterInfo filterInfo, final String[] splitedArray)
{ {
String objActionPath = "/ibase/DashboardFilterServlet?FIELDNAME=" + filterInfo.getColNameId() + "&MODNAME=" + filterInfo.getColModuleName(); String objActionPath = "/ibase/DashboardFilterServlet?FIELDNAME=" +filterInfo.getColNameId() + "&OBJ_NAME=" + filterInfo.getColModuleName();
try try
{ {
/*Start by Dhanendra 20/11/2014 Code add for before loading pophelp data label name display*/
final VerticalPanel outerVPanel = new VerticalPanel();
if (filterInfo.filterType.equals("3"))
{
outerVPanel.setHeight("200px");
VerticalPanel Vpanel = new VerticalPanel();
Label labelTh = new Label("" + filterInfo.getColName());
Vpanel.add(labelTh);
labelTh.setStyleName("filterHeaderLabel");
Vpanel.setStyleName("filterHeaderPanel");
outerVPanel.add(Vpanel);
popUpHPnl.add(outerVPanel);
}else if(filterInfo.filterType.equals("5"))
{
outerVPanel.setHeight("200px");
VerticalPanel Vpanel = new VerticalPanel();
Label labelTh = new Label("" + filterInfo.getColName());
Vpanel.add(labelTh);
labelTh.setStyleName("filterHeaderLabel");
Vpanel.setStyleName("filterHeaderPanel");
outerVPanel.add(Vpanel);
popUpHPnl.add(outerVPanel);
}
/*End by Dhanendra 20/11/2014 Code add for before loading pophelp data label name display*/
RequestBuilder reqBuilder = new RequestBuilder(RequestBuilder.POST, objActionPath); RequestBuilder reqBuilder = new RequestBuilder(RequestBuilder.POST, objActionPath);
reqBuilder.sendRequest(null, new RequestCallback() reqBuilder.sendRequest(null, new RequestCallback()
{ {
...@@ -368,34 +330,43 @@ public class FilterCreator extends Composite ...@@ -368,34 +330,43 @@ public class FilterCreator extends Composite
{ {
if (filterInfo.filterType.equals("3")) if (filterInfo.filterType.equals("3"))
{ {
VerticalPanel outerVPanel = new VerticalPanel(); /*Start code comment for label not display after loading */
/*VerticalPanel outerVPanel = new VerticalPanel();
outerVPanel.setHeight("200px"); outerVPanel.setHeight("200px");
HorizontalPanel Hpanel = new HorizontalPanel();
VerticalPanel Vpanel = new VerticalPanel(); VerticalPanel Vpanel = new VerticalPanel();
Label labelTh = new Label("" + filterInfo.getColName()); Label labelTh = new Label("" + filterInfo.getColName());
Vpanel.add(labelTh); Vpanel.add(labelTh);
labelTh.setStyleName("filterHeaderLabel"); labelTh.setStyleName("filterHeaderLabel");
Vpanel.setStyleName("filterHeaderPanel"); Vpanel.setStyleName("filterHeaderPanel");
outerVPanel.add(Vpanel);*/
/*END code comment for label not display after loading */
HorizontalPanel Hpanel = new HorizontalPanel();
Hpanel.add(popHlpGridChkBox(getPopUpDataMap(response.getText()), filterInfo, splitedArray)); Hpanel.add(popHlpGridChkBox(getPopUpDataMap(response.getText()), filterInfo, splitedArray));
outerVPanel.add(Vpanel);
outerVPanel.add(Hpanel); outerVPanel.add(Hpanel);
popUpHPnl.add(outerVPanel); popUpHPnl.add(outerVPanel);
//popUpHPnl.add(popHlpGridChkBox(getPopUpDataMap(response.getText()), filterInfo, splitedArray));
} else if (filterInfo.filterType.equals("5")) } else if (filterInfo.filterType.equals("5"))
{ {
VerticalPanel outerVPanel = new VerticalPanel();
/*Start code comment for label not display after loading */
/*VerticalPanel outerVPanel = new VerticalPanel();
outerVPanel.setHeight("200px"); outerVPanel.setHeight("200px");
HorizontalPanel Hpanel = new HorizontalPanel();
VerticalPanel Vpanel = new VerticalPanel(); VerticalPanel Vpanel = new VerticalPanel();
Label labelTh = new Label("" + filterInfo.getColName()); Label labelTh = new Label("" + filterInfo.getColName());
Vpanel.add(labelTh); Vpanel.add(labelTh);
labelTh.setStyleName("filterHeaderLabel"); labelTh.setStyleName("filterHeaderLabel");
Vpanel.setStyleName("filterHeaderPanel"); Vpanel.setStyleName("filterHeaderPanel");
outerVPanel.add(Vpanel);*/
/*END code comment for label not display after loading */
HorizontalPanel Hpanel = new HorizontalPanel();
Hpanel.add(popHelpGridRadioBtn(getPopUpDataMap(response.getText()), filterInfo, splitedArray)); Hpanel.add(popHelpGridRadioBtn(getPopUpDataMap(response.getText()), filterInfo, splitedArray));
outerVPanel.add(Vpanel);
outerVPanel.add(Hpanel); outerVPanel.add(Hpanel);
popUpHPnl.add(outerVPanel); popUpHPnl.add(outerVPanel);
//popUpHPnl.add(popHelpGridRadioBtn(getPopUpDataMap(response.getText()), filterInfo, splitedArray));
} }
} }
@Override @Override
...@@ -653,19 +624,43 @@ public class FilterCreator extends Composite ...@@ -653,19 +624,43 @@ public class FilterCreator extends Composite
public void getPopHlpStrgFrAutoComp(final FilterInfo filterInfo, final HorizontalPanel popUpHPnl, final String[] splitedArray) public void getPopHlpStrgFrAutoComp(final FilterInfo filterInfo, final HorizontalPanel popUpHPnl, final String[] splitedArray)
{ {
String objActionPath = "/ibase/DashboardFilterServlet?FIELDNAME=" + filterInfo.getColNameId() + "&MODNAME=" + filterInfo.getColModuleName(); String objActionPath = "/ibase/DashboardFilterServlet?FIELDNAME=" + filterInfo.getColNameId() + "&OBJ_NAME=" + filterInfo.getColModuleName();
try try
{ {
final VerticalPanel outerVPanel = new VerticalPanel();
VerticalPanel vPanel = new VerticalPanel();
Label columnNameLbl = null;
columnNameLbl = new Label("" + filterInfo.getColName());
vPanel.add(columnNameLbl);
columnNameLbl.setStyleName("filterHeaderLabel");
vPanel.setStyleName("filterHeaderPanel");
outerVPanel.add(vPanel);
popUpHPnl.add(outerVPanel);
RequestBuilder reqBuilder = new RequestBuilder(RequestBuilder.POST, objActionPath); RequestBuilder reqBuilder = new RequestBuilder(RequestBuilder.POST, objActionPath);
reqBuilder.sendRequest(null, new RequestCallback() reqBuilder.sendRequest(null, new RequestCallback()
{ {
@Override @Override
public void onResponseReceived(Request request, Response response) public void onResponseReceived(Request request, Response response)
{ {
Label columnNameLbl = new Label(); /*Start code comment for label not display after loading */
columnNameLbl.setText(filterInfo.getColName());
popUpHPnl.add(columnNameLbl);
new InputListWidget(response.getText(), popUpHPnl, filterInfo, splitedArray); /*VerticalPanel outerVPanel = new VerticalPanel();
VerticalPanel vPanel = new VerticalPanel();
columnNameLbl = new Label("" + filterInfo.getColName());
vPanel.add(columnNameLbl);
columnNameLbl.setStyleName("filterHeaderLabel");
vPanel.setStyleName("filterHeaderPanel");
Hpanel.add(inputTxtBox);
outerVPanel.add(vPanel); */
/*END code comment for label not display after loading */
HorizontalPanel hPanel = new HorizontalPanel();
new InputListWidget(response.getText(), hPanel, filterInfo, splitedArray);
outerVPanel.add(hPanel);
popUpHPnl.add(outerVPanel);
} }
@Override @Override
...@@ -761,7 +756,6 @@ public class FilterCreator extends Composite ...@@ -761,7 +756,6 @@ public class FilterCreator extends Composite
// String view=null; // String view=null;
final String image = "<img align='top' src='FusionChart/images/menu_button.png' height='18px' width='25px'/>"; final String image = "<img align='top' src='FusionChart/images/menu_button.png' height='18px' width='25px'/>";
MenuBar menu = new MenuBar(); MenuBar menu = new MenuBar();
try try
{ {
...@@ -798,7 +792,7 @@ public class FilterCreator extends Composite ...@@ -798,7 +792,7 @@ public class FilterCreator extends Composite
{ {
ArrayList<String> selectedParamList = getParameterList(); ArrayList<String> selectedParamList = getParameterList();
selectedView = view; selectedView = view;
selectedParamList.remove(parameterList.size()-1); selectedParamList.remove(parameterList.size() - 1);
selectedParamList.add(view); selectedParamList.add(view);
E12DashBoardPage.initaliseGraphNGrid(selectedParamList); E12DashBoardPage.initaliseGraphNGrid(selectedParamList);
} }
...@@ -807,7 +801,8 @@ public class FilterCreator extends Composite ...@@ -807,7 +801,8 @@ public class FilterCreator extends Composite
actionItem.setStyleName("popupMenuItem"); actionItem.setStyleName("popupMenuItem");
} }
} }
if(count>1){ if (count > 1)
{
viewPanel = new ScrollPanel(); viewPanel = new ScrollPanel();
viewPanel.setWidth("100%"); viewPanel.setWidth("100%");
menu.addItem(new MenuItem(addActivityImagePath, fileMenu)); menu.addItem(new MenuItem(addActivityImagePath, fileMenu));
...@@ -822,4 +817,162 @@ public class FilterCreator extends Composite ...@@ -822,4 +817,162 @@ public class FilterCreator extends Composite
return viewPanel; return viewPanel;
} }
private void getFltrSelectedData(ArrayList<FilterInfo> filterList, PopupPanel mainPopupPnl)
{
boolean isFilterNotSelected = false;
int row = 0;
FlexTable grid = null;
CheckBox checkBox = null;
TextBox fltrTxtBox = null;
BulletList bulletList = null;
ScrollPanel scrollPnl = null;
ArrayList<String> popUpSendDtatList = new ArrayList<String>();
FilterInfo fltrInfo = null;
String colName = "";
popUpSendDtatList.add(xmlName);
ListItem listItem = null;
Paragraph paragraph = null;
StringBuffer selectedChkBoxBuffer = null;
HorizontalPanel horizontalPanel = null;
VerticalPanel verticalPanel = null;
String colNameId = "";
for (int i = 0; i < filterList.size(); i++)
{
fltrInfo = filterList.get(i);
colName = fltrInfo.getColName();
colNameId = fltrInfo.getColNameId();
for (int scrlPnlCnt = 0; scrlPnlCnt < popUpHPnl.getWidgetCount(); scrlPnlCnt++)
{
if (popUpHPnl.getWidget(scrlPnlCnt) instanceof VerticalPanel)
{
verticalPanel = (VerticalPanel) popUpHPnl.getWidget(scrlPnlCnt);
if (verticalPanel.getWidget(1) instanceof HorizontalPanel)
{
horizontalPanel = (HorizontalPanel) verticalPanel.getWidget(1);
if (horizontalPanel.getWidget(0) instanceof ScrollPanel)
{
scrollPnl = (ScrollPanel) horizontalPanel.getWidget(0);
selectedChkBoxBuffer = new StringBuffer();
grid = (FlexTable) scrollPnl.getWidget();
row = grid.getRowCount();
for (int rowCnt = 1; rowCnt < row; rowCnt++)
{
checkBox = (CheckBox) grid.getWidget(rowCnt, 0);
if (checkBox.getValue())
{
if (selectedChkBoxBuffer.length() != 0)
{
selectedChkBoxBuffer.append("," + grid.getText(rowCnt, 1).trim());
} else
{
selectedChkBoxBuffer.append(grid.getText(rowCnt, 1).trim());
}
}
}
if (scrollPnl.getTitle().equals(colName))
{
//if (selectedChkBoxBuffer.toString().trim().length() != 0)
if (selectedChkBoxBuffer.toString()!= null)
{
popUpSendDtatList.add(selectedChkBoxBuffer.toString());
} else
{
if(!"CUST_CODE_SUNUSA".equalsIgnoreCase(colNameId) && !"CUST_CODE_DLV".equalsIgnoreCase(colNameId))
{
Window.alert(fltrInfo.getColName() + "Can't Be Empty");
Window.setTitle(windowTitle);
isFilterNotSelected = true;
}
}
}
} else if (horizontalPanel.getWidget(0) instanceof TextBox)
{
fltrTxtBox = (TextBox) horizontalPanel.getWidget(0);
if (fltrTxtBox.getTitle().equals(colName))
{
//if (!fltrTxtBox.getText().isEmpty())
if (fltrTxtBox.getText()!=null)
{
popUpSendDtatList.add(fltrTxtBox.getText());
} else
{
if(!"CUST_CODE_SUNUSA".equalsIgnoreCase(colNameId) && !"CUST_CODE_DLV".equalsIgnoreCase(colNameId))
{
Window.alert(fltrInfo.getColName() + "Can't Be Empty");
Window.setTitle(windowTitle);
isFilterNotSelected = true;
}
}
}
} else if (horizontalPanel.getWidget(0) instanceof BulletList)
{
bulletList = (BulletList) horizontalPanel.getWidget(0);
selectedChkBoxBuffer = new StringBuffer();
if (bulletList.getTitle().equals(colName))
{
for (int j = 0; j < bulletList.getWidgetCount(); j++)
{
if (bulletList.getWidget(j) instanceof ListItem)
{
listItem = (ListItem) bulletList.getWidget(j);
if (listItem.getWidget(0) instanceof Paragraph)
{
paragraph = (Paragraph) listItem.getWidget(0);
if (selectedChkBoxBuffer.length() != 0)
{
selectedChkBoxBuffer.append("," + paragraph.getText().trim());
} else
{
selectedChkBoxBuffer.append(paragraph.getText().trim());
}
}
}
}
//if (selectedChkBoxBuffer.toString().trim().length() != 0)
if (selectedChkBoxBuffer.toString()!= null)
{
popUpSendDtatList.add(selectedChkBoxBuffer.toString());
} else
{
/*if(!"CUST_CODE_SUNUSA".equalsIgnoreCase(colNameId) || !"CUST_CODE_DLV".equalsIgnoreCase(colNameId))
{
Window.alert(fltrInfo.getColName() + "Can't Be Empty");
Window.setTitle(windowTitle);
isFilterNotSelected = true;
}*/
if(!"CUST_CODE_SUNUSA".equalsIgnoreCase(colNameId) && !"CUST_CODE_DLV".equalsIgnoreCase(colNameId))
{
Window.alert(fltrInfo.getColName() + "Can't Be Empty");
Window.setTitle(windowTitle);
isFilterNotSelected = true;
}
}
}
}
}
}
}
}
if (!isFilterNotSelected)
{
Window.setTitle("");
mainPopupPnl.hide();
popUpSendDtatList.add(selectedView);
setParameterList(popUpSendDtatList);
E12DashBoardPage.initaliseGraphNGrid(popUpSendDtatList);
}
}
} }
\ No newline at end of file
...@@ -4,6 +4,7 @@ import java.util.Date; ...@@ -4,6 +4,7 @@ import java.util.Date;
import com.google.gwt.core.client.Callback; import com.google.gwt.core.client.Callback;
import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONObject;
import com.google.gwt.json.client.JSONValue;
import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.RootPanel;
...@@ -34,9 +35,17 @@ public class GWTDashBoardReport implements EntryPoint ...@@ -34,9 +35,17 @@ public class GWTDashBoardReport implements EntryPoint
{ {
@Override @Override
public void onSuccess(JSONObject jsnObj) public void onSuccess(JSONObject jsnObj)
{
JSONValue jsonValue = jsnObj.get("metaData");
if (jsonValue.toString().length() != 2)
{ {
getParameterList(jsnObj); getParameterList(jsnObj);
}else
{
Window.alert("MetaData Should Be Proper");
} }
}
@Override @Override
public void onFailure(String result) public void onFailure(String result)
{ {
......
...@@ -154,7 +154,6 @@ public class GraphComponent extends Composite ...@@ -154,7 +154,6 @@ public class GraphComponent extends Composite
scrlPanel.add(flexTable); scrlPanel.add(flexTable);
scrlPanel.setStyleName("flextableScrlPnl"); scrlPanel.setStyleName("flextableScrlPnl");
// RootPanel.get("chartContainergrid").add(scrlPanel); // RootPanel.get("chartContainergrid").add(scrlPanel);
RootPanel.get("chartContainer"+componentId).add(scrlPanel); RootPanel.get("chartContainer"+componentId).add(scrlPanel);
RootPanel.get("chartContainer"+componentId).add(horizontalPnl); RootPanel.get("chartContainer"+componentId).add(horizontalPnl);
...@@ -216,37 +215,52 @@ public class GraphComponent extends Composite ...@@ -216,37 +215,52 @@ public class GraphComponent extends Composite
String objActionPath = ""; String objActionPath = "";
String page = parameterList.get(0); String page = parameterList.get(0);
String append=""; String append="";
/****Start Add For SUN Dashboard****/
if (page.equals("sales")) if (page.equals("sales"))
{ {
objActionPath = "/ibase/" + servletname + "?month=" + parameterList.get(1) + "&dataSourceName=" + dbDataSource; objActionPath = "/ibase/" + servletname + "?month=" + parameterList.get(1) + "&dataSourceName=" + dbDataSource;
} else if (page.equals("expense")) }
else if (page.equals("expense"))
{ {
objActionPath = "/ibase/" + servletname + "?month=" + parameterList.get(1) + "&dataSourceName=" + dbDataSource; objActionPath = "/ibase/" + servletname + "?month=" + parameterList.get(1) + "&dataSourceName=" + dbDataSource;
} else if (page.equals("topbrand")) }
else if (page.equals("topbrand"))
{ {
objActionPath = "/ibase/" + servletname + "?topNos=" + parameterList.get(1) + "&month=" + parameterList.get(2) + "&dataSourceName=" + dbDataSource; objActionPath = "/ibase/" + servletname + "?topNos=" + parameterList.get(1) + "&month=" + parameterList.get(2) + "&dataSourceName=" + dbDataSource;
} else if (page.equals("recall")) }
else if (page.equals("recall"))
{ {
objActionPath = "/ibase/" + servletname + "?days=" + parameterList.get(1) + "&dataSourceName=" + dbDataSource; objActionPath = "/ibase/" + servletname + "?lastMonth=" + parameterList.get(1) + "&dataSourceName=" + dbDataSource;
} else if (page.equals("rcp")) }
else if (page.equals("rcp"))
{ {
objActionPath = "/ibase/" + servletname + "?dataSourceName=" + dbDataSource + "&days=" + parameterList.get(1); objActionPath = "/ibase/" + servletname + "?dataSourceName=" + dbDataSource + "&days=" + parameterList.get(1);
} else if (page.equals("qc")) }
else if (page.equals("qc"))
{ {
objActionPath = "/ibase/" + servletname + "?geoLocation=" + parameterList.get(1) + "&month=" + parameterList.get(2) + "&dataSourceName=" + dbDataSource; objActionPath = "/ibase/" + servletname + "?geoLocation=" + parameterList.get(1) + "&month=" + parameterList.get(2) + "&dataSourceName=" + dbDataSource;
} else if (page.equals("bspl")) }
else if (page.equals("bspl"))
{ {
objActionPath = "/ibase/" + servletname + "?sitecode=" + parameterList.get(1) + "&acctprd=" + parameterList.get(2) + "&prdfrom=" + parameterList.get(3) + "&prdto=" + parameterList.get(4) + "&formatcode=" + parameterList.get(5) + "&reporttype=" + parameterList.get(6) + "&dataSourceName=" + dbDataSource; objActionPath = "/ibase/" + servletname + "?sitecode=" + parameterList.get(1) + "&acctprd=" + parameterList.get(2) + "&prdfrom=" + parameterList.get(3) + "&prdto=" + parameterList.get(4) + "&formatcode=" + parameterList.get(5) + "&reporttype=" + parameterList.get(6) + "&dataSourceName=" + dbDataSource;
} else if (page.equals("msrscore")) }
else if (page.equals("msrscore"))
{ {
objActionPath = "/ibase/" + servletname + "?territory=" + parameterList.get(1) + "&salesperson=" + parameterList.get(2) + "&month=" + parameterList.get(3) + "&year=" + parameterList.get(4) + "&dataSourceName=" + dbDataSource; objActionPath = "/ibase/" + servletname + "?territory=" + parameterList.get(1) + "&salesperson=" + parameterList.get(2) + "&month=" + parameterList.get(3) + "&year=" + parameterList.get(4) + "&dataSourceName=" + dbDataSource;
} else if (page.equals("dqsa")) }
else if (page.equals("dqsa"))
{ {
objActionPath = "/ibase/" + servletname + "?&dataSourceName=" + dbDataSource+ "&reportName="+page;
objActionPath = "/ibase/" + servletname + "?&dataSourceName=" + dbDataSource;
} }
else if (page.equals("customerinfo"))
{
objActionPath = "/ibase/" + servletname + "?custCode=" + parameterList.get(1) + "&prdCode=" + parameterList.get(2) + "&dataSourceName=" + dbDataSource+"&reportName="+page;
}
else if (page.equals("ordershipment"))
{
objActionPath = "/ibase/" + servletname + "?lastMonth=" + parameterList.get(1)+"&siteCode=" + parameterList.get(2) + "&custCode=" + parameterList.get(3) + "&custCodeDlv=" + parameterList.get(4) +"&dataSourceName=" + dbDataSource+"&reportName="+page;
}
/****End Add For SUN Dashboard****/
// start Add dashboard mapping for OTC dashboard on dated 15-oct-2004 // start Add dashboard mapping for OTC dashboard on dated 15-oct-2004
...@@ -269,12 +283,6 @@ public class GraphComponent extends Composite ...@@ -269,12 +283,6 @@ public class GraphComponent extends Composite
} }
//end Add dashboard mapping for OTC dashboard on dated 15-oct-2004 //end Add dashboard mapping for OTC dashboard on dated 15-oct-2004
/*Start Add For SUN Dashboard*/
else if (page.equals("customerinfo"))
{
objActionPath = "/ibase/" + servletname + "?custCode=" + parameterList.get(1) + "&prdCode=" + parameterList.get(2) + "&dataSourceName=" + dbDataSource+"&reportName="+page;
}
/*End Add For SUN Dashboard*/
RequestBuilder reqBuilder = new RequestBuilder(RequestBuilder.POST, objActionPath); RequestBuilder reqBuilder = new RequestBuilder(RequestBuilder.POST, objActionPath);
try try
...@@ -316,8 +324,8 @@ public class GraphComponent extends Composite ...@@ -316,8 +324,8 @@ public class GraphComponent extends Composite
} }
} }
public boolean isNumeric(String s) { public boolean isNumeric(String s) {
return s.matches("[-+]?\\d*\\.?\\d+"); return s.matches("[-+]?\\d*\\.?\\d+");
} }
} }
...@@ -72,7 +72,6 @@ public class InputListWidget extends Composite ...@@ -72,7 +72,6 @@ public class InputListWidget extends Composite
}); });
onLodListItm.add(paragraph); onLodListItm.add(paragraph);
onLodListItm.add(span); onLodListItm.add(span);
itemBox.setFocus(true); itemBox.setFocus(true);
list.add(onLodListItm); list.add(onLodListItm);
} }
...@@ -118,19 +117,29 @@ public class InputListWidget extends Composite ...@@ -118,19 +117,29 @@ public class InputListWidget extends Composite
}); });
popUpHPnl.add(list); popUpHPnl.add(list);
// popUpHPnl.getElement().setAttribute("onclick", "document.getElementById('suggestion_box').focus()"); //popUpHPnl.getElement().setAttribute("onclick", "document.getElementById('suggestion_box').focus()");
box.setFocus(true); box.setFocus(true);
} }
private void deselectItem(final TextBox itemBox, final BulletList list) private void deselectItem(final TextBox itemBox, final BulletList list)
{ {
String[] itmBoxArr = null;
String itmBoxValue = "";
if (itemBox.getValue() != null && !"".equals(itemBox.getValue().trim())) if (itemBox.getValue() != null && !"".equals(itemBox.getValue().trim()))
{ {
final ListItem displayItem = new ListItem(); final ListItem displayItem = new ListItem();
displayItem.setStyleName("token-input-token"); displayItem.setStyleName("token-input-token");
Paragraph p = new Paragraph(itemBox.getValue()); //Paragraph p = new Paragraph(itemBox.getValue());
//**Added new code by sachin on 20/11/14*//
itmBoxValue = itemBox.getValue();
itmBoxArr = itmBoxValue.split("-");
System.out.println(" spltedVlaue=" + itmBoxArr[0]);
/** End Added new code by sachin on 20/11/14 */
Paragraph p = new Paragraph(itmBoxArr[1].trim());
displayItem.addClickHandler(new ClickHandler() displayItem.addClickHandler(new ClickHandler()
{ {
public void onClick(ClickEvent clickEvent) public void onClick(ClickEvent clickEvent)
...@@ -138,7 +147,6 @@ public class InputListWidget extends Composite ...@@ -138,7 +147,6 @@ public class InputListWidget extends Composite
displayItem.addStyleName("token-input-selected-token"); displayItem.addStyleName("token-input-selected-token");
} }
}); });
Span span = new Span("x"); Span span = new Span("x");
span.addClickHandler(new ClickHandler() span.addClickHandler(new ClickHandler()
{ {
...@@ -151,11 +159,9 @@ public class InputListWidget extends Composite ...@@ -151,11 +159,9 @@ public class InputListWidget extends Composite
displayItem.add(p); displayItem.add(p);
displayItem.add(span); displayItem.add(span);
// hold the original value of the item selected // hold the original value of the item selected
GWT.log("Adding selected item '" + itemBox.getValue() + "'", null); GWT.log("Adding selected item '" + itemBox.getValue() + "'", null);
itemsSelected.add(itemBox.getValue()); itemsSelected.add(itemBox.getValue());
GWT.log("Total: " + itemsSelected, null); GWT.log("Total: " + itemsSelected, null);
list.insert(displayItem, list.getWidgetCount() - 1); list.insert(displayItem, list.getWidgetCount() - 1);
itemBox.setValue(""); itemBox.setValue("");
itemBox.setFocus(true); itemBox.setFocus(true);
...@@ -181,6 +187,8 @@ public class InputListWidget extends Composite ...@@ -181,6 +187,8 @@ public class InputListWidget extends Composite
Node detailNode = null; Node detailNode = null;
NodeList columnList = null; NodeList columnList = null;
Node columnNode = null; Node columnNode = null;
String code = "";
String descr = "";
try try
{ {
document = XMLParser.parse(xmlMetadata); document = XMLParser.parse(xmlMetadata);
...@@ -205,11 +213,19 @@ public class InputListWidget extends Composite ...@@ -205,11 +213,19 @@ public class InputListWidget extends Composite
if ("DETAIL".equals(detailNode.getNodeName())) if ("DETAIL".equals(detailNode.getNodeName()))
{ {
columnList = detailNode.getChildNodes(); columnList = detailNode.getChildNodes();
for (int colNodCtr = 0; colNodCtr < 1; colNodCtr++) for (int colNodCtr = 0; colNodCtr < 2; colNodCtr++)
{ {
columnNode = columnList.item(colNodCtr); columnNode = columnList.item(colNodCtr);
oracle.add(columnNode.getChildNodes().item(0).getNodeValue()); if (colNodCtr == 0)
{
code = columnNode.getChildNodes().item(0).getNodeValue();
} else if (colNodCtr == 1)
{
descr = columnNode.getChildNodes().item(0).getNodeValue();
}
//oracle.add(columnNode.getChildNodes().item(0).getNodeValue());
} }
oracle.add(descr + " - " + code);
} }
} }
} }
......
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