Skip to content

B
business-java
Commit e37d5808 authored by caluka's avatar caluka
Browse files
Options

dispay status date , change location label 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101395 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d4fdcfef
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 9 deletions
webitm-dis/module-resource/jsp/empTravelInfo.jsp
View file @ e37d5808
...@@ -13,7 +13,7 @@ String fileType="",str="",siteDescr=""; ...@@ -13,7 +13,7 @@ String fileType="",str="",siteDescr="";
String add1="",add2="",add3="",pinPass="",countName="",nationality="",grpCode=""; String add1="",add2="",add3="",pinPass="",countName="",nationality="",grpCode="";
String city="",stateDescr="",tel1="",mobNo="",passportFullName="",status=""; String city="",stateDescr="",tel1="",mobNo="",passportFullName="",status="";
String ticketStatus="",visaStatus="",flightCode="",flightDescr=""; String ticketStatus="",visaStatus="",flightCode="",flightDescr="";
java.sql.Date travelDateFrom=null,travelDateTo=null,tranDate=null,birthDate=null,dateOfIssue=null,validUpto=null,confDate=null,ticketStatusDate=null,visaStatusDate=null; java.sql.Date travelDateFrom=null,travelDateTo=null,tranDate=null,birthDate=null,dateOfIssue=null,validUpto=null,confDate=null,ticketStatusDate=null,visaStatusDate=null,statusDate=null;
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
SimpleDateFormat sdf; SimpleDateFormat sdf;
...@@ -51,10 +51,11 @@ SimpleDateFormat sdf; ...@@ -51,10 +51,11 @@ SimpleDateFormat sdf;
file.mkdirs(); file.mkdirs();
} }
conn = ConnDriver.getConnectDB("DriverITM");
sql= " SELECT TRAN_DATE,SITE_CODE,EMP_CODE,NAME_PREFIX,EMP_FNAME,EMP_MNAME,EMP_LNAME,DESIGNATION,ITEM_SER,EMAIL_ID,REPORT_TO,PASSPORT_NO, " + sql= " SELECT TRAN_DATE,SITE_CODE,EMP_CODE,NAME_PREFIX,EMP_FNAME,EMP_MNAME,EMP_LNAME,DESIGNATION,ITEM_SER,EMAIL_ID,REPORT_TO,PASSPORT_NO, " +
" BIRTH_DATE,BIRTH_PLACE,DATE_OF_ISSUE,PLACE_OF_ISSUE,VALID_UPTO,MEAL_PREF,EMP_CODE__TEAM_HEAD,STATE_CODE__WORK,ZONE_CODE,HUB, "+ " BIRTH_DATE,BIRTH_PLACE,DATE_OF_ISSUE,PLACE_OF_ISSUE,VALID_UPTO,MEAL_PREF,EMP_CODE__TEAM_HEAD,STATE_CODE__WORK,ZONE_CODE,HUB, "+
" LOCATION,CONFIRMED,CONF_DATE,ADDR1__PASS,ADDR2__PASS,ADDR3__PASS,city__pass,state_descr__pass,cur_tel1,mobile_no,emp_name__pass,pin__pass,count_name,nationality,status,ticket_status,ticket_stat_date,visa_status,visa_stat_date,flight_code FROM EMP_TRAVEL_INFO WHERE TRAN_ID = ? "; " LOCATION,CONFIRMED,CONF_DATE,ADDR1__PASS,ADDR2__PASS,ADDR3__PASS,city__pass,state_descr__pass,cur_tel1,mobile_no,emp_name__pass,pin__pass,count_name,nationality,status,status_date,ticket_status,ticket_stat_date,visa_status,visa_stat_date,flight_code FROM EMP_TRAVEL_INFO WHERE TRAN_ID = ? ";
conn = ConnDriver.getConnectDB("DriverITM");
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1,tranID); pstmt.setString(1,tranID);
System.out.println( "@@@@@ sqlgetdata :: [[" + sql+"]]" ); System.out.println( "@@@@@ sqlgetdata :: [[" + sql+"]]" );
...@@ -85,6 +86,13 @@ SimpleDateFormat sdf; ...@@ -85,6 +86,13 @@ SimpleDateFormat sdf;
hub= checkNull(rs.getString("HUB")); hub= checkNull(rs.getString("HUB"));
location= checkNull(rs.getString("LOCATION")); location= checkNull(rs.getString("LOCATION"));
confirmed= checkNull(rs.getString("CONFIRMED")); confirmed= checkNull(rs.getString("CONFIRMED"));
if("Y".equalsIgnoreCase(confirmed))
{
confirmed="YES";
}else
{
confirmed="NO";
}
confDate= rs.getDate("CONF_DATE"); confDate= rs.getDate("CONF_DATE");
add1= checkNull(rs.getString("ADDR1__PASS")); add1= checkNull(rs.getString("ADDR1__PASS"));
add2= checkNull(rs.getString("ADDR2__PASS")); add2= checkNull(rs.getString("ADDR2__PASS"));
...@@ -98,16 +106,49 @@ SimpleDateFormat sdf; ...@@ -98,16 +106,49 @@ SimpleDateFormat sdf;
countName = checkNull(rs.getString("count_name")); countName = checkNull(rs.getString("count_name"));
nationality = checkNull(rs.getString("nationality")); nationality = checkNull(rs.getString("nationality"));
status = checkNull(rs.getString("status")); status = checkNull(rs.getString("status"));
if("S".equalsIgnoreCase(status))
{
status="SUBMIT";
}else if("R".equalsIgnoreCase(status))
{
status="NOT TRAVELED";
}else if("T".equalsIgnoreCase(status))
{
status="TRAVELED";
}else if("O".equalsIgnoreCase(status))
{
status="OPEN";
}else if("X".equalsIgnoreCase(status))
{
status="CANCELLED";
}
statusDate = rs.getDate("status_date");
ticketStatus= checkNull(rs.getString("ticket_status")); ticketStatus= checkNull(rs.getString("ticket_status"));
if("Y".equalsIgnoreCase(ticketStatus))
{
ticketStatus="YES";
}else
{
ticketStatus="NO";
}
ticketStatusDate= rs.getDate("ticket_stat_date"); ticketStatusDate= rs.getDate("ticket_stat_date");
visaStatus= checkNull(rs.getString("visa_status")); visaStatus= checkNull(rs.getString("visa_status"));
if("Y".equalsIgnoreCase(visaStatus))
{
visaStatus="YES";
}else
{
visaStatus="NO";
}
visaStatusDate= rs.getDate("visa_stat_date"); visaStatusDate= rs.getDate("visa_stat_date");
flightCode = checkNull(rs.getString("flight_code")); flightCode = checkNull(rs.getString("flight_code"));
if("V".equalsIgnoreCase(mealPref)) if("V".equalsIgnoreCase(mealPref))
mealPref = "Veg"; mealPref = "Veg";
else if("N".equalsIgnoreCase(mealPref))
mealPref="Non veg";
else else
mealPref="Nonveg"; mealPref="Jain Veg";
} }
rs.close(); rs.close();
...@@ -116,7 +157,7 @@ SimpleDateFormat sdf; ...@@ -116,7 +157,7 @@ SimpleDateFormat sdf;
pstmt = null; pstmt = null;
sql = " select descr from gencodes where fld_name='FLIGHT_CODE' AND MOD_NAME='W_EMP_TRAVEL_INFO' and fld_value=? "; sql = " select descr from gencodes where fld_name='FLIGHT_CODE' AND MOD_NAME='W_EMP_TRAVEL_INFO' and fld_value=? ";
conn = ConnDriver.getConnectDB("DriverITM"); //conn = ConnDriver.getConnectDB("DriverITM");
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1,flightCode); pstmt.setString(1,flightCode);
System.out.println( "@@@@@ sqlgetdata :: [[" + sql+"]]" ); System.out.println( "@@@@@ sqlgetdata :: [[" + sql+"]]" );
...@@ -134,7 +175,7 @@ SimpleDateFormat sdf; ...@@ -134,7 +175,7 @@ SimpleDateFormat sdf;
sql = " select group_code,travel_date__from,travel_date__to from nsm_email where division = ? "; sql = " select group_code,travel_date__from,travel_date__to from nsm_email where division = ? ";
conn = ConnDriver.getConnectDB("DriverITM"); //conn = ConnDriver.getConnectDB("DriverITM");
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1,itemSer); pstmt.setString(1,itemSer);
System.out.println( "@@@@@ sqlgetdata :: [[" + sql+"]]" ); System.out.println( "@@@@@ sqlgetdata :: [[" + sql+"]]" );
...@@ -152,7 +193,7 @@ SimpleDateFormat sdf; ...@@ -152,7 +193,7 @@ SimpleDateFormat sdf;
pstmt = null; pstmt = null;
sql = " select descr from site where site_code = ? "; sql = " select descr from site where site_code = ? ";
conn = ConnDriver.getConnectDB("DriverITM"); //conn = ConnDriver.getConnectDB("DriverITM");
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
System.out.println( "@@@@@ sqlgetdata :: [[" + sql+"]]" ); System.out.println( "@@@@@ sqlgetdata :: [[" + sql+"]]" );
...@@ -217,8 +258,10 @@ SimpleDateFormat sdf; ...@@ -217,8 +258,10 @@ SimpleDateFormat sdf;
fos.close(); fos.close();
System.out.println("No.of attached document ::["+cnt+"]"); System.out.println("No.of attached document ::["+cnt+"]");
if( conn != null ) if( conn != null )
{
conn.close(); conn.close();
conn = null; conn = null;
}
}catch( Exception ex ) }catch( Exception ex )
{ {
ex.printStackTrace(); ex.printStackTrace();
...@@ -290,6 +333,7 @@ SimpleDateFormat sdf; ...@@ -290,6 +333,7 @@ SimpleDateFormat sdf;
<tr STYLE= 'background-color:#DCDCDC;'><td align="right" style = "width:300px">Confirmed :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=confirmed%></td></tr> <tr STYLE= 'background-color:#DCDCDC;'><td align="right" style = "width:300px">Confirmed :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=confirmed%></td></tr>
<tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Conf Date :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=confDate==null?" ":sdf.format(confDate)%></td></tr> <tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Conf Date :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=confDate==null?" ":sdf.format(confDate)%></td></tr>
<tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Status :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=status%></td></tr> <tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Status :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=status%></td></tr>
<tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Status Date :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=statusDate==null?" ":sdf.format(statusDate)%></td></tr>
<tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Ticket Status :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=ticketStatus%></td></tr> <tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Ticket Status :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=ticketStatus%></td></tr>
<tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Ticket Status Date :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=ticketStatusDate==null?" ":sdf.format(ticketStatusDate)%></td></tr> <tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Ticket Status Date :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=ticketStatusDate==null?" ":sdf.format(ticketStatusDate)%></td></tr>
...@@ -332,7 +376,7 @@ SimpleDateFormat sdf; ...@@ -332,7 +376,7 @@ SimpleDateFormat sdf;
<tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">State Code Work :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=stateCode%></td></tr> <tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">State Code Work :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=stateCode%></td></tr>
<tr STYLE= 'background-color:#DCDCDC;'><td align="right" style = "width:300px">Zone Code :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=zoneCode%></td></tr> <tr STYLE= 'background-color:#DCDCDC;'><td align="right" style = "width:300px">Zone Code :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=zoneCode%></td></tr>
<tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Hub :</td><td align="left"><%=hub%></td></tr> <tr STYLE= 'background-color:#D3D3D3;'><td align="right" style = "width:300px">Hub :</td><td align="left"><%=hub%></td></tr>
<tr STYLE= 'background-color:#DCDCDC;'><td align="right" style = "width:300px">Location :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=location%></td></tr> <tr STYLE= 'background-color:#DCDCDC;'><td align="right" style = "width:300px">Work Location :</td><td align="left" STYLE= 'POSITION:relative;TOP:1;left:20;width:1000'><%=location%></td></tr>
</table> </table>
<!-- </tr> --> <!-- </tr> -->
......
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