From c6080a290cd3d3d411bf728bf18d0d8541abab39 Mon Sep 17 00:00:00 2001 From: Thitichaipun <thitichaipun@gmail.com> Date: Fri, 25 Dec 2020 11:44:53 +0700 Subject: [PATCH] #9569 RECURIT แก้เพิ่มชื่อกลาง --- hrAppWeb.war/RECRUIT/ApplicantPrint_DHAS.jsp | 41 ++++++++++++++++++++++++----------------- hrAppWeb.war/RECRUIT/CandidatePrint_DHAS.jsp | 39 +++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/hrAppWeb.war/RECRUIT/ApplicantPrint_DHAS.jsp b/hrAppWeb.war/RECRUIT/ApplicantPrint_DHAS.jsp index b3f930c..cad3d21 100644 --- a/hrAppWeb.war/RECRUIT/ApplicantPrint_DHAS.jsp +++ b/hrAppWeb.war/RECRUIT/ApplicantPrint_DHAS.jsp @@ -748,16 +748,16 @@ document.add(detail); // --------------- new line ----------------- - sizeColumn = new float[]{25.0f,30.0f,15.0f,15.0f,20.0f,26.25f}; - detail = new PdfPTable(6); + sizeColumn = new float[]{20.0f,15.0f,15.0f,12.0f,12.0f,7.0f,5.0f,26.25f}; + detail = new PdfPTable(8); detail.setWidthPercentage(100); detail.setWidths(sizeColumn); setPaddingTop(3.5f); setPaddingLeft(3.5f); setPaddingRight(3.5f); setPaddingBottom(6.5f); - detail.addCell(getCellData("ตำแหน่งที่สมัคร", font14B, "", "CENTER", "MIDDLE", 3, 0,false,true)); - detail.addCell(getCellData("เงินเดือนที่ต้องการ", font14B, "", "CENTER", "TOP", 2, 0,false,true)); + detail.addCell(getCellData("ตำแหน่งที่สมัคร", font14B, "", "CENTER", "MIDDLE", 4, 0,false,true)); + detail.addCell(getCellData("เงินเดือนที่ต้องการ", font14B, "", "CENTER", "TOP", 3, 0,false,true)); //IMAGE img = Image.getInstance(getImagePath("RECRUIT_UPLOAD-dir","PICTURE/",simmapplicantwithgson.mapplicantPersonal.imgname,"DEFAULTPERSON.jpg")); cellDetail = new PdfPCell(img, false); @@ -767,12 +767,12 @@ cellDetail.setColspan(1); cellDetail.setRowspan(7); detail.addCell(cellDetail); - detail.addCell(getCellData("1."+screen.getString("MJOBCODE", "TDESC"), font14N, "", "LEFT", "TOP", 3, 0)); - detail.addCell(getCellData(DFO.format(Integer.valueOf(screen.getString("SALARY_EXPECT"))).toString()+" บาท", font14N, "", "RIGHT", "TOP", 2, 0)); - detail.addCell(getCellData(" ", font14N, "", "LEFT", "TOP", 3, 0)); - detail.addCell(getCellData(" ", font14N, "", "RIGHT", "TOP", 2, 0)); + detail.addCell(getCellData("1."+screen.getString("MJOBCODE", "TDESC"), font14N, "", "LEFT", "TOP", 4, 0)); + detail.addCell(getCellData(DFO.format(Integer.valueOf(screen.getString("SALARY_EXPECT"))).toString()+" บาท", font14N, "", "RIGHT", "TOP", 3, 0)); + detail.addCell(getCellData(" ", font14N, "", "LEFT", "TOP", 4, 0)); + detail.addCell(getCellData(" ", font14N, "", "RIGHT", "TOP", 3, 0)); - detail.addCell(getCellData("ประวัติส่วนตัว", font14N, "", "CENTER", "TOP", 5, 0,false,true)); + detail.addCell(getCellData("ประวัติส่วนตัว", font14N, "", "CENTER", "TOP", 7, 0,false,true)); setPaddingTop(2.5f); setPaddingLeft(3.5f); @@ -801,6 +801,8 @@ content.add(Chu3); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData(simmapplicantwithgson.mapplicantPersonal.fname.tha, font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0)); + detail.addCell(getCellData("ชื่อกลาง", font14N, "NO", "LEFT", "TOP", 0, 0)); + detail.addCell(getCellData("..........", font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0)); detail.addCell(getCellData("นามสกุล", font14N, "NO", "LEFT", "TOP", 0, 0)); detail.addCell(getCellData(simmapplicantwithgson.mapplicantPersonal.lname.tha, font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 2, 0)); @@ -825,6 +827,8 @@ content.add(Chu3); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData(simmapplicantwithgson.mapplicantPersonal.fname.eng, font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0)); + detail.addCell(getCellData("MIDDLENAME", font14N, "NO", "LEFT", "TOP", 0, 0)); + detail.addCell(getCellData("..........", font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0)); detail.addCell(getCellData("SURNAME", font14N, "NO", "LEFT", "TOP", 0, 0)); detail.addCell(getCellData(simmapplicantwithgson.mapplicantPersonal.lname.eng, font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 2, 0)); setPaddingTop(0.0f); @@ -1629,7 +1633,7 @@ detail.addCell(getCellData("ถึง "+jobexp.get("end"+num).toString(), font12N, "NO", "LEFT", "MIDDLE", 1, 0)); detail.addCell(getCellData("เงินเดือนเริ่มต้น ", font12N, "NO", "LEFT", "MIDDLE", 1, 0)); detail.addCell(getCellData(jobexp.get("salary"+num) + " บาท", font12N, "R_BOTTOM_DOT", "LEFT", "MIDDLE", 2, 0)); - detail.addCell(getCellData("้เงินเดือนสุดท้าย ", font12N, "NO", "LEFT", "MIDDLE", 1, 0)); + detail.addCell(getCellData("เงินเดือนสุดท้าย ", font12N, "NO", "LEFT", "MIDDLE", 1, 0)); detail.addCell(getCellData(jobexp.get("endingsalary"+num) + " บาท", font12N, "R_BOTTOM_DOT", "LEFT", "MIDDLE", 2, 0)); detail.addCell(getCellData("สาเหตุที่ลาออก", font12N, "NO", "LEFT", "MIDDLE", 1, 0)); @@ -1757,7 +1761,7 @@ content.add(new Chunk(" เคย",font12N)); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData("ตำแหน่ง", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(applyStatus?applyPosition:"", font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 0, 0)); + detail.addCell(getCellData(applyStatus?applyPosition:"", font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 0, 0,true,false)); detail.addCell(getCellData("ระยะเวลา", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); detail.addCell(getCellData(applyStatus?applyYear:"", font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 0, 0)); detail.addCell(getCellData(" เดือน / ปี", font12N, "NO", "LEFT", "MIDDLE", 0, 0)); @@ -1772,9 +1776,9 @@ content.add(new Chunk(" รู้",font12N)); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData("ชื่อ-สกุล", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(companyReference.getString("fullname0"), font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 0, 0)); + detail.addCell(getCellData(companyReference.getString("fullname0"), font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 0, 0,true,false)); detail.addCell(getCellData("ตำแหน่ง", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(companyReference.getString("position0"), font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 2, 0)); + detail.addCell(getCellData(companyReference.getString("position0"), font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 2, 0,true,false)); detail.addCell(getCellData("การเป็นสมาชิกของชมรม / สหภาพ / สโมสรท่าน", font12N, "NO", "LEFT", "MIDDLE", 0, 0)); content = new Phrase(); @@ -1786,9 +1790,9 @@ content.add(new Chunk(" เคย",font12N)); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData("ชื่อสถาบัน", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(tradeStatus?tradeName:"", font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 0, 0)); + detail.addCell(getCellData(tradeStatus?tradeName:"", font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 0, 0,true,false)); detail.addCell(getCellData("ตำแหน่ง", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(tradeStatus?tradeRole:"", font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 2, 0)); + detail.addCell(getCellData(tradeStatus?tradeRole:"", font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 2, 0,true,false)); document.add(detail); // --------------- new line -----------------shiftwork @@ -1796,6 +1800,9 @@ Boolean overtime_status = simmapplicantwithgson.mapplicantOther.overtime.status; String overtime = simmapplicantwithgson.mapplicantOther.overtime.explain; Boolean ordination = simmapplicantwithgson.mapplicantOther.ordination; + if(overtime_status == null){ + overtime_status = false; + } sizeColumn = new float[]{10.0f,5.0f,5.0f,15.0f,5.0f,5.0f,5.0f,10.0f}; detail = new PdfPTable(8); detail.setWidthPercentage(100); @@ -1903,9 +1910,9 @@ content.add(new Chunk(policecapture_status? AwesomeIcons.ICON_CHECK:AwesomeIcons.ICON_CHECK_EMPTY,fontAwesome)); content.add(new Chunk(" เคย คดี",font12N)); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); - detail.addCell(getCellData(policecapture, font12N, "R_BOTTOM_DOT", "LEFT", "MIDDLE", 0, 0)); + detail.addCell(getCellData(policecapture, font12N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0,true,false)); detail.addCell(getCellData("โทษที่ได้รับ", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData("...", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); + detail.addCell(getCellData("...", font12N, "NO", "CENTER", "TOP", 0, 0,true,false)); document.add(detail); // --------------- new line ----------------- diff --git a/hrAppWeb.war/RECRUIT/CandidatePrint_DHAS.jsp b/hrAppWeb.war/RECRUIT/CandidatePrint_DHAS.jsp index c125d37..c414320 100644 --- a/hrAppWeb.war/RECRUIT/CandidatePrint_DHAS.jsp +++ b/hrAppWeb.war/RECRUIT/CandidatePrint_DHAS.jsp @@ -751,16 +751,16 @@ document.add(detail); // --------------- new line ----------------- - sizeColumn = new float[]{25.0f,30.0f,15.0f,15.0f,20.0f,26.25f}; - detail = new PdfPTable(6); + sizeColumn = new float[]{20.0f,15.0f,15.0f,12.0f,12.0f,7.0f,5.0f,26.25f}; + detail = new PdfPTable(8); detail.setWidthPercentage(100); detail.setWidths(sizeColumn); setPaddingTop(3.5f); setPaddingLeft(3.5f); setPaddingRight(3.5f); setPaddingBottom(6.5f); - detail.addCell(getCellData("ตำแหน่งที่สมัคร", font14B, "", "CENTER", "MIDDLE", 3, 0,false,true)); - detail.addCell(getCellData("เงินเดือนที่ต้องการ", font14B, "", "CENTER", "TOP", 2, 0,false,true)); + detail.addCell(getCellData("ตำแหน่งที่สมัคร", font14B, "", "CENTER", "MIDDLE", 4, 0,false,true)); + detail.addCell(getCellData("เงินเดือนที่ต้องการ", font14B, "", "CENTER", "TOP", 3, 0,false,true)); //IMAGE img = Image.getInstance(getImagePath("RECRUIT_UPLOAD-dir","PICTURE/",simmcandidatewithgson.mcandidatePersonal.imgname,"DEFAULTPERSON.jpg")); cellDetail = new PdfPCell(img, false); @@ -770,12 +770,12 @@ cellDetail.setColspan(1); cellDetail.setRowspan(7); detail.addCell(cellDetail); - detail.addCell(getCellData("1."+screen.getString("MJOBCODE", "TDESC"), font14N, "", "LEFT", "TOP", 3, 0)); - detail.addCell(getCellData(DFO.format(Integer.valueOf(screen.getString("SALARY_EXPECT"))).toString()+" บาท", font14N, "", "RIGHT", "TOP", 2, 0)); - detail.addCell(getCellData(" ", font14N, "", "LEFT", "TOP", 3, 0)); - detail.addCell(getCellData(" ", font14N, "", "RIGHT", "TOP", 2, 0)); + detail.addCell(getCellData("1."+screen.getString("MJOBCODE", "TDESC"), font14N, "", "LEFT", "TOP", 4, 0)); + detail.addCell(getCellData(DFO.format(Integer.valueOf(screen.getString("SALARY_EXPECT"))).toString()+" บาท", font14N, "", "RIGHT", "TOP", 3, 0)); + detail.addCell(getCellData(" ", font14N, "", "LEFT", "TOP", 4, 0)); + detail.addCell(getCellData(" ", font14N, "", "RIGHT", "TOP", 3, 0)); - detail.addCell(getCellData("ประวัติส่วนตัว", font14N, "", "CENTER", "TOP", 5, 0,false,true)); + detail.addCell(getCellData("ประวัติส่วนตัว", font14N, "", "CENTER", "TOP", 7, 0,false,true)); setPaddingTop(2.5f); setPaddingLeft(3.5f); @@ -804,6 +804,8 @@ content.add(Chu3); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData(simmcandidatewithgson.mcandidatePersonal.fname.tha, font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0)); + detail.addCell(getCellData("ชื่อกลาง", font14N, "NO", "LEFT", "TOP", 0, 0)); + detail.addCell(getCellData("..........", font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0)); detail.addCell(getCellData("นามสกุล", font14N, "NO", "LEFT", "TOP", 0, 0)); detail.addCell(getCellData(simmcandidatewithgson.mcandidatePersonal.lname.tha, font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 2, 0)); @@ -828,6 +830,8 @@ content.add(Chu3); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData(simmcandidatewithgson.mcandidatePersonal.fname.eng, font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0)); + detail.addCell(getCellData("MIDDLENAME", font14N, "NO", "LEFT", "TOP", 0, 0)); + detail.addCell(getCellData("..........", font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 0, 0)); detail.addCell(getCellData("SURNAME", font14N, "NO", "LEFT", "TOP", 0, 0)); detail.addCell(getCellData(simmcandidatewithgson.mcandidatePersonal.lname.eng, font14N, "R_BOTTOM_DOT", "LEFT", "TOP", 2, 0)); setPaddingTop(0.0f); @@ -1632,7 +1636,7 @@ detail.addCell(getCellData("ถึง "+jobexp.get("end"+num).toString(), font12N, "NO", "LEFT", "MIDDLE", 1, 0)); detail.addCell(getCellData("เงินเดือนเริ่มต้น ", font12N, "NO", "LEFT", "MIDDLE", 1, 0)); detail.addCell(getCellData(jobexp.get("salary"+num) + " บาท", font12N, "R_BOTTOM_DOT", "LEFT", "MIDDLE", 2, 0)); - detail.addCell(getCellData("้เงินเดือนสุดท้าย ", font12N, "NO", "LEFT", "MIDDLE", 1, 0)); + detail.addCell(getCellData("เงินเดือนสุดท้าย ", font12N, "NO", "LEFT", "MIDDLE", 1, 0)); detail.addCell(getCellData(jobexp.get("endingsalary"+num) + " บาท", font12N, "R_BOTTOM_DOT", "LEFT", "MIDDLE", 2, 0)); detail.addCell(getCellData("สาเหตุที่ลาออก", font12N, "NO", "LEFT", "MIDDLE", 1, 0)); @@ -1760,9 +1764,9 @@ content.add(new Chunk(" เคย",font12N)); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData("ตำแหน่ง", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(applyStatus?applyPosition:"", font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 0, 0)); + detail.addCell(getCellData(applyStatus?applyPosition:"", font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 0, 0,true,false))); detail.addCell(getCellData("ระยะเวลา", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(applyStatus?applyYear:"", font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 0, 0)); + detail.addCell(getCellData(applyStatus?applyYear:"", font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 0, 0,true,false))); detail.addCell(getCellData(" เดือน / ปี", font12N, "NO", "LEFT", "MIDDLE", 0, 0)); detail.addCell(getCellData("การรู้จักพนักงานของบริษัทฯนี้ท่าน", font12N, "NO", "LEFT", "MIDDLE", 0, 0)); @@ -1775,9 +1779,9 @@ content.add(new Chunk(" รู้",font12N)); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData("ชื่อ-สกุล", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(companyReference.getString("fullname0"), font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 0, 0)); + detail.addCell(getCellData(companyReference.getString("fullname0"), font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 0, 0,true,false))); detail.addCell(getCellData("ตำแหน่ง", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(companyReference.getString("position0"), font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 2, 0)); + detail.addCell(getCellData(companyReference.getString("position0"), font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 2, 0,true,false))); detail.addCell(getCellData("การเป็นสมาชิกของชมรม / สหภาพ / สโมสรท่าน", font12N, "NO", "LEFT", "MIDDLE", 0, 0)); content = new Phrase(); @@ -1789,9 +1793,9 @@ content.add(new Chunk(" เคย",font12N)); detail.addCell(getCellData2( content, "NO", "LEFT", "MIDDLE", 1, 1) ); detail.addCell(getCellData("ชื่อสถาบัน", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(tradeStatus?tradeName:"", font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 0, 0)); + detail.addCell(getCellData(tradeStatus?tradeName:"", font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 0, 0,true,false))); detail.addCell(getCellData("ตำแหน่ง", font12N, "NO", "CENTER", "MIDDLE", 0, 0)); - detail.addCell(getCellData(tradeStatus?tradeRole:"", font12N, "R_BOTTOM_DOT", "CENTER", "MIDDLE", 2, 0)); + detail.addCell(getCellData(tradeStatus?tradeRole:"", font12N, "R_BOTTOM_DOT", "CENTER", "TOP", 2, 0,true,false))); document.add(detail); // --------------- new line -----------------shiftwork @@ -1799,6 +1803,9 @@ Boolean overtime_status = simmcandidatewithgson.mcandidateOther.overtime.status; String overtime = simmcandidatewithgson.mcandidateOther.overtime.explain; Boolean ordination = simmcandidatewithgson.mcandidateOther.ordination; + if(overtime_status == null){ + overtime_status = false; + } sizeColumn = new float[]{10.0f,5.0f,5.0f,15.0f,5.0f,5.0f,5.0f,10.0f}; detail = new PdfPTable(8); detail.setWidthPercentage(100); -- libgit2 0.26.0