Implementing Marketing event in standard server

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

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

@@ -463,8 +463,18 @@ public class FilterCreator extends Composite
 										for (int colNodCtr = 0; colNodCtr < columnList.getLength(); colNodCtr++)
 										{
 											columnNode = columnList.item(colNodCtr);
+											//Added by Sagar B. on [09-May-18]START
+											if (colNodCtr == 5)
+											{
+												columnDataList.add(columnNode.getChildNodes().item(0).getNodeValue());
+											} 
+											else if (colNodCtr == 6)
+											{
 												columnDataList.add(columnNode.getChildNodes().item(0).getNodeValue());
 											}
+											//Added by Sagar B. on [09-May-18]END
+										}
+										CommonUtils.printOnConsole("columnDataList::["+columnDataList+"]");
 										columnValueMap.put("" + headCtr, columnDataList);
 									}
 								}
@@ -1133,6 +1143,8 @@ public class FilterCreator extends Composite
 	}
 
 	private void setTitleOnFilterSubmit(ArrayList<String> parameterList, JSONObject metaDataJsnObj)
+	{
+		try
 		{
 			String metadatName = parameterList.get(0);
 			String temp = "";
@@ -1286,7 +1298,8 @@ public class FilterCreator extends Composite
 				}
 			} else
 			{
-			
+				if( reportHeading != null && reportHeading.trim().length() > 0 )
+				{
 					if (title.size() > 1)
 					{
 						titleLbl.setText(title.get(0) + " - " + getMonth(reportHeading) + title.get(1) + getMonth(parameterList.get(2)));
@@ -1339,7 +1352,12 @@ public class FilterCreator extends Composite
 						/*End Code for Remove Colon for no Filter by Dhanendra on 31-07-15*/
 					}
 				}
-
+			}
+		}
+		catch (Exception e) 
+		{
+			CommonUtils.printOnConsole("Exception in setTitleOnFilterSubmit::"+e.getMessage());
+		}
 	}
 
 	private void getAutoCompWithDigitFltr(final FilterInfo filterInfo, final VerticalPanel popUpVPnl, final String[] splitedArray)

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

@@ -467,18 +467,23 @@ public class InputListWidget extends Composite
 									if ("DETAIL".equals(detailNode.getNodeName()))
 									{
 										columnList = detailNode.getChildNodes();
-										for (int colNodCtr = 0; colNodCtr < 2; colNodCtr++)
+										//for (int colNodCtr = 0; colNodCtr < 2; colNodCtr++)
+										for (int colNodCtr = 0; colNodCtr < columnList.getLength(); colNodCtr++)	//Changed by Sagar B. on [09-May-18]
 										{
 											columnNode = columnList.item(colNodCtr);
-											if (colNodCtr == 0)
+											//if (colNodCtr == 0)
+											if (colNodCtr == 5)	//Changed by Sagar B. on [09-May-18]
 											{
 												code = columnNode.getChildNodes().item(0).getNodeValue();
-											} else if (colNodCtr == 1)
+											} 
+											//else if (colNodCtr == 1)
+											else if (colNodCtr == 6)	//Changed by Sagar B. on [09-May-18]
 											{
 												descr = columnNode.getChildNodes().item(0).getNodeValue();
 											}
 											//oracle.add(columnNode.getChildNodes().item(0).getNodeValue());
 										}
+										CommonUtils.printOnConsole("descr + \" - \" + code::["+descr + " - " + code+"]");
 										oracle.add(descr + " - " + code);
 									}
 								}

webitm-dashboard/GWT-Component/war/GwtDashboardPage.css

@@ -2312,3 +2312,33 @@ thead#removeBorderGrid > tr > th {
   }
 
 /*Ended by Vinay For Card Type Dashboard applicable for browser & mobile*/
+/*added by mrunalini sinkar for browser report(start)*/
+.noWrapping
+{
+  white-space: nowrap;
+}
+.trCardPadding
+{
+  border-bottom: 1px solid #e8e8e8;
+  border-top: 1px solid #e8e8e8
+  
+}
+
+.trCardSwip
+{
+  border-bottom: 1px solid #e8e8e8;
+  font-weight: 600;
+}
+
+.tdstyle {
+border-left: none;
+border-right: none;
+border-top: none;
+border-bottom: 1px solid #518bf7;
+width: 45px;
+cursor: pointer;
+background: transparent;
+color: #518bf7;
+}
+
+/*added by mrunalini sinkar for browser report(end)*/
\ No newline at end of file

webitm-dashboard/GWT-Component/war/GwtDashboardPage.html

@@ -6,6 +6,11 @@
 <link type="text/css" rel="stylesheet" href="GwtDashboardPage.css">
 <link type="text/css" rel="stylesheet" href="circle.css">
 
+<!-- Nilesh for only mobile Camp_plan -->
+<link type="text/css" rel="stylesheet" href="GwtDashboardMobilePage.css"> 
+<script src="FusionChart/js/Camp_trackReport.js" type="text/javascript"></script>
+<!-- Nilesh for only mobile Camp_plan -->
+
 <!--Start Import for Bubble Chart using chart.js API By Dhanendra on date 16-01-2017-->
 <script type="text/javascript" language="javascript" src="FusionChart/js/BubbleChart.js"></script>
 <script type="text/javascript" language="javascript" src="FusionChart/js/Chart.js"></script>

webitm-dashboard/GWT-Component/war/jsp/ExcelExportMobile.jsp

+<%@ page import="java.io.*" %>
+<%-- <%@ page language="java" contentType="text/excel; charset=ISO-8859-1"
+pageEncoding="ISO-8859-1"%> --%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+pageEncoding="UTF-8"%>
+<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -->
+<%
+System.out.println("@@@@@@@@@ In mobile exportjsp.jsp @@@@@@@@@@@@@@@@");
+String path = request.getParameter("data");
+System.out.print( "exportjsp : ["+ path +"]");
+
+path = path.substring(path.indexOf( "/dump" ));
+
+System.out.print( "path saftt : ["+ path +"]");
+%>
+<html>
+<body>
+<iframe src="/ibase/<%= path%>" ></iframe>
+</body>
+</html>
+