#9214 นำเมนูแสดง พนง.ที่สมัครงาน มาแสดงใน EMVIEW โดนโคลนมาจาก NHSO

hrAppWeb.war/EMPVIEW/EMV_HEADMENU.jsp

@@ -18,21 +18,24 @@
 		myprofile = (UProfile)session.getAttribute("userprofile");
 	}
 %>
-<link rel="stylesheet" href="<%=request.getContextPath()%>/CSS/font-awesome.css">
+<link rel="stylesheet" href="<%=request.getContextPath()%>/CSS/fontawesome-all.css">
 <link rel="stylesheet" href="<%=request.getContextPath()%>/CSS/Bootstrap/css/bootstrap.css">
 <link rel="stylesheet" href="<%=request.getContextPath()%>/CSS/metro.css"/>
 <link rel="stylesheet" href="<%=request.getContextPath()%>/CSS/MENU_BACKEND.css" />
 <link rel="stylesheet" href="<%=request.getContextPath()%>/JS/fullcalendar-yearview/fullcalendar.css"/>
 <link rel="stylesheet" href="<%=request.getContextPath()%>/CSS/Bootstrap/css/animate.min.css">
-<link rel="stylesheet" href="<%=request.getContextPath()%>/CSS/EMPVIEW_LAYOUT.min.css">
+<link rel="stylesheet" href="<%=request.getContextPath()%>/CSS/EMPVIEW_LAYOUT.css">
+
 
 <script type="text/javascript" src="../JS/SCREEN.js"></script>
+<script>setLang("<%=myprofile.get("lang")%>");</script>
 <script type="text/javascript" src="../JS/EVENTS.js"></script>
 <script type="text/javascript" src="../JS/UTILITIES.js"></script>
 <script type="text/javascript" src="../JS/ACTIVE_OBJECT.js"></script>
 <script type="text/javascript" src="../JS/jquery-2.1.3.min.js"></script>
 <script type="text/javascript" src="../public/lib/angular/angular.min.js"></script>
 <script type="text/javascript" src="../JS/ANGULAR/SCREEN_ANGULAR.js"></script>
+<script type='text/javascript' src="../JS/ANGULAR/swaplang.factory.js"></script>
 <script type="text/javascript" src="../JS/fullcalendar-yearview/lib/moment.min.js"></script>
 <script type="text/javascript" src="../JS/fullcalendar-yearview/fullcalendar.js"></script>
 <script type="text/javascript" src="../JS/fullcalendar-yearview/lang-all.js"></script>
@@ -41,10 +44,12 @@
 <script type="text/javascript" src="../CSS/Bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="../JS/jquery-ui-1.11.4.js"></script>
 <script type="text/javascript" src="../JS/EMPVIEW_FUNC.js"></script>
+<script type='text/javascript' src='../JS/urljobboard.js'></script>
+<%-- <script type='text/javascript' src='../JS/urljb.js'></script> --%>
 <script src="../JS/orgchart/jquery.jOrgChart.js"></script>
 
 <script>
-	setLang("<%=myprofile.get("lang")%>");
+	var isShowMenu = 0
 	$(document).ready(function(){
 		$(function(){
 			$(".li-toggle").hover(function(){
@@ -103,6 +108,17 @@
 			});
 		});
 
+		$(".btn-dropdown").click(function(){
+			if(isShowMenu == 0){
+				$(".menu-bar-list").show()
+				isShowMenu = 1
+			}else{
+				$(".menu-bar-list").hide()
+				isShowMenu = 0	
+			}
+			
+		})
+
 	});
 
 	function linkDetailNew(newid){
@@ -136,17 +152,17 @@
 		<%
 			if(!myprofile.get("user_level").equals("guest")){
 		%>
-				<jsp:include page="EMV_HEADER.jsp" flush="true" />
+				<jsp:include page="../EMPVIEW/EMV_HEADER.jsp" flush="true" />
 		<%
 			}
 		%>
 	</div>
 	<div class="menu-bar">
 		<div class="menu-logo">
-			<%=chk.chkNullString(screen_logo.getString("logotxt"),"Logo")%>
+			<%=chk.chkNullString(screen_logo.getString("logotxt"),"Logo")%>&nbsp;&nbsp;
+			<i class="fa fa-angle-double-down btn-dropdown"></i>
 		</div>
-
-		<jsp:include page="EMV_TOPMENU.jsp" flush="true" />
+		<jsp:include page="../EMPVIEW/EMV_TOPMENU.jsp" flush="true" />
 		<%
 			screen_logo.getInquiry().closeConnection();
 		%>

hrAppWeb.war/EMPVIEW/JS/REC_APPLICANT/REC_APPLICANT.Controller.js

@@ -3,9 +3,8 @@
  */
 
 'use strict'
-recModule.controller('REC_APPLICANT', ['$scope', '$mdDialog', 'RecService', 'SwapLang', function ($scope, $mdDialog, RecService) {
+recModule.controller('REC_APPLICANT', ['$scope', '$mdDialog', 'RecService', function ($scope, $mdDialog, RecService) {
   $scope.isReady = false
-  $scope.swlang = new swaplang()
   $scope.lang = getLang();
   $scope.now = ''
   $scope.userJobid = ''

hrAppWeb.war/EMPVIEW/JS/REC_CANDIDATE/REC_CANDIDATE.Controller.js

@@ -3,9 +3,8 @@
  */
 
 'use strict'
-recModule.controller('REC_CANDIDATE', ['$scope', '$mdDialog', 'RecService', 'SwapLang', function ($scope, $mdDialog, RecService) {
+recModule.controller('REC_CANDIDATE', ['$scope', '$mdDialog', 'RecService', function ($scope, $mdDialog, RecService) {
   $scope.isReady = false
-  $scope.swlang = new swaplang()
   $scope.lang = getLang();
   $scope.now = ''
   $scope.userJobid = ''

hrAppWeb.war/EMPVIEW/REC_APPLICANT.jsp

@@ -42,7 +42,6 @@
       let userBu3 = '<%=up.get("bu3")%>'
       let action = '<%=action%>'
       let userBu2 = '<%=up.get("bu2")%>'
-      let isActPosition = '<%=isActPosition%>'
       let scope = angular.element(document.cscform).scope()
       scope.$apply(function () {
         scope.action = action
@@ -72,9 +71,9 @@
   <div class="container csc-content">
     <form name="cscform" class="form-horizontal" method="">
       <input type="hidden" name="__applicantid">
-      <input type="hidden" name="__action" value="<%=action%>">
       <input type="hidden" name="__screen" value="">
       <input type="hidden" name="__fixCon" value="">
+       <input type="hidden" name="__name" value="<%=up.get("job")%>">
       <div ng-hide="isReady" class='loading-page'>
           <div class='spiner'></div>
       </div>
@@ -202,7 +201,8 @@
             <th>สถานะ</th>
             <th>ต้องการเรียกสัมภาษณ์</th>
           </tr>
-          <tbody ng-repeat="app in applicants | filter : search | orderBy:propertyNameIn:reverseIn">
+          <%-- | filter: filterDirector  --%>
+          <tbody ng-repeat="app in applicants | filter : filterInternal | filter : search | orderBy:propertyNameIn:reverseIn">
           <tr>
             <td class='center'>{{app.applicantid}}</td>
             <td class='center'>{{app.employeeid}}</td>
@@ -243,7 +243,8 @@
             <th>สถานะ</th>
             <th>ต้องการเรียกสัมภาษณ์</th>
           </tr>
-          <tbody ng-repeat="app in applicants | filter : search | orderBy:propertyNameEx:reverseEx" >
+          <%-- | filter: filterDirector  --%>
+          <tbody ng-repeat="app in applicants | filter : filterExternal | filter : search | orderBy:propertyNameEx:reverseEx" >
           <tr>
             <td  class='center'>{{app.applicantid}}</td>
             <td class='center'><a style="color: #4d4d4d !important;" ng-click="goPages(app.applicantid)"><master-prefix code="{{app.personal.prefixid}}"></master-prefix> {{app.personal.fname[lang]}} - {{app.personal.lname[lang]}}</a></td>

hrAppWeb.war/EMPVIEW/REC_CANDIDATE.jsp

@@ -9,6 +9,8 @@
   if (session != null) {
     up = (UProfile) session.getAttribute("userprofile");
   }
+  String action = chk.chkNullString(request.getParameter("__action"), "view");
+
 %>
 <html ng-app="RECRUIT">
 <head>
@@ -40,7 +42,6 @@
       let userBu3 = '<%=up.get("bu3")%>'
       let action = '<%=action%>'
       let userBu2 = '<%=up.get("bu2")%>'
-      let isActPosition = '<%=isActPosition%>'
       let scope = angular.element(document.cscform).scope()
       scope.$apply(function () {
         scope.action = action
@@ -198,7 +199,9 @@
               <span class="sortorder" ng-show="propertyNameIn === 'applicantdate'" ng-class="{reverse: reverseIn}"></span>
             </th>
           </tr>
-          <tbody ng-repeat="app in applicants | filter : search | orderBy:propertyNameIn:reverseIn">
+          <tbody ng-repeat="app in applicants | filter: filterDirector | filter : filterInternal | filter : availableRequest | filter : search | orderBy:propertyNameIn:reverseIn">
+          <%-- filter : availableRequest | filter: filterDirector | --%>
+          <tbody ng-repeat="app in applicants | filter : filterInternal | filter : search | orderBy:propertyNameIn:reverseIn">
           <tr>
             <td class='center'>{{app.applicantid}}</td>
             <td class='center'>{{app.employeeid}}</td>
@@ -232,7 +235,9 @@
               <span class="sortorder" ng-show="propertyNameEx === 'applicantdate'" ng-class="{reverse: reverseEx}"></span>
             </th>
           </tr>
-          <tbody ng-repeat="app in applicants | filter : search | orderBy:propertyNameEx:reverseEx" >
+          <%-- <tbody ng-repeat="app in applicants | filter: filterDirector | filter : filterExternal | filter : availableRequest | filter : search | orderBy:propertyNameEx:reverseEx" > --%>
+          <%-- filter : availableRequest | filter: filterDirector | --%>
+          <tbody ng-repeat="app in applicants | filter : filterExternal |  filter : search | orderBy:propertyNameEx:reverseEx" >
           <tr>
             <td  class='center'>{{app.applicantid}}</td>
             <td class='center'><a style="color: #4d4d4d !important;" ng-click="goPages(app.candidateid)"><master-prefix code="{{app.personal.prefixid}}"></master-prefix> {{app.personal.fname[lang]}} - {{app.personal.lname[lang]}}</a></td>