no message

src/main/java/com/itsol/quantrivanphong/report/leaveform/business/LeaveFormBusiness.java

@@ -135,4 +135,8 @@ public class LeaveFormBusiness {
     public LeaveForm showLeaveFormById(int id) {
         return leaveFormRepository.findLeaveFormById(id);
     }
+
+    public List<LeaveType> getLeaveTypeList() {
+        return leaveTypeRepository.findAll();
+    }
 }

src/main/java/com/itsol/quantrivanphong/report/leaveform/controller/LeaveFormController.java

 package com.itsol.quantrivanphong.report.leaveform.controller;
 
 import com.itsol.quantrivanphong.exception.InputException;
+import com.itsol.quantrivanphong.model.LeaveType;
 import com.itsol.quantrivanphong.report.leaveform.business.LeaveFormBusiness;
 import com.itsol.quantrivanphong.report.leaveform.dto.LeaveFormDTO;
 import com.itsol.quantrivanphong.model.LeaveForm;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -76,4 +76,9 @@ public class LeaveFormController {
     public ResponseEntity<LeaveForm> showLeaveFormById(@PathVariable int id) {
         return ResponseEntity.ok(leaveFormBusiness.showLeaveFormById(id));
     }
+
+    @GetMapping(path = "/leaveType/getAll")
+    public ResponseEntity<List<LeaveType>> getAllLeaveType() {
+        return ResponseEntity.ok(leaveFormBusiness.getLeaveTypeList());
+    }
 }

src/main/resources/public/index.html

@@ -54,7 +54,7 @@
     <script src="common/js/jquery.dataTables.js"></script>
     <script src="common/js/dataTables.bootstrap4.js"></script>
     <!-- Custom scripts for all pages-->
-    <script src="common/js/sb-admin.min.js"></script>\
+    <script src="common/js/sb-admin.min.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-animate.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-sanitize.js"></script>
     <script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-1.3.3.js"></script>

src/main/resources/public/pages/leaveform/leaveForm.html

@@ -46,14 +46,18 @@
                         <tr>
                             <td><label>Employee Id</label></td>
                             <td>
-                                <input type="text" maxlength="10" value="" ng-model="lfdto.employeeId" style="width: 100%;"/>
+                                <input type="text" maxlength="10" value="" ng-model="lfdto.employeeId"/>
                             </td>
                         </tr>
 
                         <tr>
                             <td><label>Leave Type Id</label></td>
                             <td>
-                                <input type="text" maxlength="10" value="" ng-model="lfdto.leaveTypeId" style="width: 100%;"/>
+<!--                                <input type="text" maxlength="10" value="" ng-model="lfdto.leaveTypeId" style="width: 100%;"/>-->
+                                <select ng-model="lfdto.leaveTypeId">
+                                    <option  value="">Select Leave Type</option>
+                                    <option  ng-repeat="lf in leaveTypeList" value="{{lf.id}}">{{lf.name}}</option>
+                                </select>
                             </td>
                         </tr>
                         <tr>

src/main/resources/public/pages/leaveform/leaveFormController.js

@@ -33,6 +33,16 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
         console.log(response)
     });
 
+    //get all leave type
+    $http({
+        method : 'GET',
+        url : "http://localhost:8080/employee/leaveType/getAll"
+    }).then(function successCallback(response) {
+        console.log(response);
+        $scope.leaveTypeList=response.data;
+    }, function errorCallback(response) {
+        console.log(response)
+    });
     //delete leave form
     $scope.delete = function (lf) {
         $http({

src/main/resources/public/pages/timesheet/timeSheet.html

@@ -56,8 +56,9 @@
 <!--                                <input type="text" maxlength="10" value="" ng-model="tsdto.eprojectId" style="width: 100%;"/>-->
 <!--                            </td>-->
                             <td>
-                                <select ng-repeat="ep in eProjectList">
-                                    <option value="ahihi">{{ep.project.name}}</option>
+                                <select ng-model="tsdto.eprojectId">
+                                    <option  value="">Select Project</option>
+                                    <option  ng-repeat="ep in eProjectList" value="{{ep.id}}">{{ep.project.name}}</option>
                                 </select>
                             </td>
                         </tr>
@@ -65,7 +66,7 @@
                         <tr>
                             <td><label>Employee Id</label></td>
                             <td>
-                                <input type="text" maxlength="10" value="" ng-model="tsdto.employeeId" style="width: 100%;"/>
+                                <input type="text" maxlength="10" value="" ng-model="tsdto.employeeId"/>
                             </td>
                         </tr>
                         <tr>

src/main/resources/public/pages/timesheet/timesheet.html

@@ -56,8 +56,9 @@
 <!--                                <input type="text" maxlength="10" value="" ng-model="tsdto.eprojectId" style="width: 100%;"/>-->
 <!--                            </td>-->
                             <td>
-                                <select ng-repeat="ep in eProjectList">
-                                    <option value="ahihi">{{ep.project.name}}</option>
+                                <select ng-model="tsdto.eprojectId">
+                                    <option  value="">Select Project</option>
+                                    <option  ng-repeat="ep in eProjectList" value="{{ep.id}}">{{ep.project.name}}</option>
                                 </select>
                             </td>
                         </tr>
@@ -65,7 +66,7 @@
                         <tr>
                             <td><label>Employee Id</label></td>
                             <td>
-                                <input type="text" maxlength="10" value="" ng-model="tsdto.employeeId" style="width: 100%;"/>
+                                <input type="text" maxlength="10" value="" ng-model="tsdto.employeeId"/>
                             </td>
                         </tr>
                         <tr>