Updated

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@191504 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/GWT-Component/src/ibase/client/FilterCreator.java

@@ -463,6 +463,10 @@ public class FilterCreator extends Composite
 										for (int colNodCtr = 0; colNodCtr < columnList.getLength(); colNodCtr++)
 										{
 											columnNode = columnList.item(colNodCtr);
+											//Added by KAMAL.P when colNodCtr != 5 & 6 . on 02/10/2018 START
+											columnDataList.add(columnNode.getChildNodes().item(0).getNodeValue());
+											//Added by KAMAL.P when colNodCtr != 5 & 6 . on 02/10/2018 END
+											
 											//Added by Sagar B. on [09-May-18]START
 											if (colNodCtr == 5)
 											{
@@ -1086,14 +1090,26 @@ public class FilterCreator extends Composite
 						else if (horizontalPanel.getWidget(0) instanceof ListBox)
 						{
 							fltrListBox = (ListBox) horizontalPanel.getWidget(0);
-							if (fltrListBox.getElement().getId().equals(colName))
+							//Changes done by KAMAL.P start(02/10/2018)
+							int itemCount = fltrListBox.getItemCount();
+							CommonUtils.printOnConsole(fltrListBox.getName() + " >> itemCount===>"+itemCount);
+							//Changes done by KAMAL.P END(02/10/2018)
+
+							if (fltrListBox.getElement().getId().equals(colName) )
 							{
 								if (!fltrListBox.getElement().getId().isEmpty())
 								{
 									//popUpSendDtatList.add(""+fltrListBox.getSelectedIndex());
 									//popUpSendDtatListDtl.add(fltrListBox.getItemText(fltrListBox.getSelectedIndex()));
 									//Added by varsha to set pophelp index title on filter submit on dated 10 July 17
-									if(fltrInfo.getShowOnTitleIndex().equalsIgnoreCase("1"))
+									//Changes done by KAMAL.P start(02/10/2018)
+									if(itemCount == 0)
+									{
+										popUpSendDtatList.add("");
+										popUpSendDtatListDtl.add("");
+									}
+									//Changes done by KAMAL.P END(02/10/2018)
+									else if(fltrInfo.getShowOnTitleIndex().equalsIgnoreCase("1"))
 									{
 										popUpSendDtatList.add(""+fltrListBox.getValue(fltrListBox.getSelectedIndex()));
 										popUpSendDtatListDtl.add(fltrListBox.getValue(fltrListBox.getSelectedIndex()));