Skip to content

D
DHAS
Commit e6d4ebec by Thitichaipun Wutthisak
Options

#9569 รอConsult ตรวจสอบและแก้ไข เพิ่มเติม

parent 1f7c2a5a
Showing with 11 additions and 11 deletions
hrAppWeb.war/RECRUIT/ApplicantPrint_DHAS.jsp
......@@ -295,7 +295,7 @@
//----------------------------END OTHER-----------------------------------------
//----------------------------SETDATA EDUCATION------------------------------------
MyHashMap educationbackground = new MyHashMap();
String[] masterdegree = {"L015", "L016", "L017","L009", "L006", "L010","L004", "L008","005"};
String[] masterdegree = {"L004","L005","L006","L007","L008","L009","L010","L011","L012","L013","L014","L015", "L016", "L017"};
String degreeDesc = "";
String EduV = ""; //Education Vocabulary
for (String degreekey : masterdegree) {
......@@ -353,10 +353,10 @@
} else {
educationbackground.put("major" + EduV, education.major.majorlist.name.tha);
}
if (education.fac.searchtext == null) {
educationbackground.put("fac" + EduV, education.fac.facultylist.faculty_tha);
if (education.fac.searchtext != null) {
educationbackground.put("fac" + EduV, education.fac.searchtext);
} else {
educationbackground.put("fac" + EduV, education.fac.facultylist.faculty_tha);
educationbackground.put("fac" + EduV, education.fac.facultylist.facultydesc.tha);
}
educationbackground.put("gpa" + EduV, education.gpa);
}
......
hrAppWeb.war/RECRUIT/CandidatePrint_DHAS.jsp
......@@ -295,7 +295,7 @@
//----------------------------END OTHER-----------------------------------------
//----------------------------SETDATA EDUCATION------------------------------------
MyHashMap educationbackground = new MyHashMap();
String[] masterdegree = {"L015", "L016", "L017","L009", "L006", "L010","L004", "L008","005"};
String[] masterdegree = {"L001","L002","L003","L004","L005","L006","L007","L008","L009","L010","L011","L012","L013","L014","L015", "L016","L017"};
String degreeDesc = "";
String EduV = ""; //Education Vocabulary
for (String degreekey : masterdegree) {
......@@ -321,7 +321,7 @@
educationbackground.put("major" + degreekey, "");
educationbackground.put("fac" + degreekey, "");
educationbackground.put("gpa" + degreekey, "");
}
}
}
DbInquiry inqdegree = new InitialInquiry(screen.getUProfile()).getDbInquiry("mdegree");
......@@ -353,10 +353,10 @@
} else {
educationbackground.put("major" + EduV, education.major.majorlist.name.tha);
}
if (education.fac.searchtext == null) {
educationbackground.put("fac" + EduV, education.fac.facultylist.faculty_tha);
if (education.fac.searchtext != null) {
educationbackground.put("fac" + EduV, education.fac.searchtext);
} else {
educationbackground.put("fac" + EduV, education.fac.facultylist.faculty_tha);
educationbackground.put("fac" + EduV, education.fac.facultylist.facultydesc.tha);
}
educationbackground.put("gpa" + EduV, education.gpa);
}
......@@ -1193,7 +1193,7 @@
detail.addCell(getCellData(educationbackground.get("facL015").toString(), font12N, "", "CENTER", "TOP", 0, 0,true,false));
detail.addCell(getCellData(educationbackground.get("majorL015").toString(), font12N, "", "CENTER", "TOP", 0, 0,true,false));
detail.addCell(getCellData(educationbackground.get("gpaL015").toString(), font12N, "", "CENTER", "TOP", 0, 0,true,false));
/* // แสดงเฉพาะ จบที่สูงที่สุดก่อน
// แสดงเฉพาะ จบที่สูงที่สุดก่อน
detail.addCell(getCellData("ปวช. / ปวส.", font12N, "", "CENTER", "TOP", 0, 0));
detail.addCell(getCellData("...", font12N, "", "CENTER", "TOP", 0, 0));
detail.addCell(getCellData("...", font12N, "", "CENTER", "TOP", 0, 0));
......@@ -1217,7 +1217,7 @@
detail.addCell(getCellData(educationbackground.get("facM3").toString(), font12N, "", "CENTER", "TOP", 0, 0,true,false));
detail.addCell(getCellData(educationbackground.get("majorM3").toString(), font12N, "", "CENTER", "TOP", 0, 0,true,false));
detail.addCell(getCellData(educationbackground.get("gpaM3").toString(), font12N, "", "CENTER", "TOP", 0, 0,true,false));
*/ document.add(detail);
document.add(detail);
// --------------- new line -----------------
sizeColumn = new float[]{10.0f,15.0f,10.0f,10.0f,10.0f,15.0f,10.0f,10.0f,10.0f};
detail = new PdfPTable(9);
......
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