Merge pull request #233 from ogomaemmanuel/node-sass

Node sass

.gitignore

@@ -37,4 +37,5 @@ node_modules/
 src/main/resources/message.properties
 
 logs
-logs/logfile.txt
+logs/logfile.txt
+hr_core/src/main/resources/static/js/dist

hr_core/src/main/resources/static/js/src/components/employee_management/departments/DepartmentCreateForm.vue

@@ -32,6 +32,7 @@
 </template>
 <script>
     import CommonMixin from "../../../mixins/common_mixin"
+    import {Notification as notify} from "element-ui";
 
     export default {
         mixins: [CommonMixin],
@@ -50,10 +51,10 @@
                 axios.post("/api/departments",
                     this.department).then(resp => {
                     this.loading = false
-                    vm.$swal({
+                    notify({
                         type: "success",
                         title: "Success",
-                        text: "Department  successfully created"
+                        message: "Department  successfully created"
                     })
                     this.$emit("departmentCreated")
                 }, error => {

hr_core/src/main/resources/static/js/src/components/employee_management/designations/DesignationCreateForm.vue

@@ -73,6 +73,7 @@
 <script>
     import CommonMixin from "../../../mixins/common_mixin"
     import _debounce from "lodash.debounce"
+    import  {Notification as notify} from "element-ui";
 
     export default {
         mixins: [CommonMixin],
@@ -103,10 +104,10 @@
                 let vm = this;
                 this.designation.departmentId = this.selectedDepartment.id;
                 axios.post("/api/designations", this.designation).then(resp => {
-                    vm.$swal({
+                    notify({
                         type: "success",
                         title: "Success",
-                        text: "Designation  successfully created"
+                        message: "Designation  successfully created"
                     })
                     this.$emit("designationCreated")
                 }, error => {

hr_core/src/main/resources/static/js/src/components/employee_management/overtime_requests/OvertimeRequestCreateForm.vue

@@ -75,6 +75,8 @@
     import {DatePicker} from "element-ui"
     import ModalTemplate from "../../common/ModalTemplate";
 
+    import {Notification as notify } from  "element-ui"
+
     export default {
         mixins: [CommonMixin],
         components: {
@@ -107,12 +109,13 @@
                 let vm = this;
                 axios.post("/api/overtime-requests",
                     this.overtimeRequest).then(resp => {
-                    vm.$swal({
-                        type: "success",
+                      notify({
+                        message: "Overtime request successfully saved",
                         title: "Success",
-                        text: "Overtime request successfully saved"
-                    })
-                    this.$emit("overtimeRequestCreated")
+                        type: "success"
+                      })
+                  this.$router.back();
+                    //this.$emit("overtimeRequestCreated")
                 }, error => {
                     if (error.response.status == 400) {
                         this.errors = error.response.data;

hr_core/src/main/resources/static/js/src/components/employee_management/overtime_requests/OvertimerRequestList.vue

@@ -77,6 +77,7 @@
             </div>
         </div>
         <router-view
+                @overtimeRequestCreated="getOvertimeRequests()"
                 @overtimeRequestUpdated="getOvertimeRequests()">
         </router-view>
     </div>

hr_core/src/main/resources/static/js/src/components/employee_management/termination/TerminationCreateForm.vue

@@ -78,6 +78,7 @@
     import EmployeeSelectInput from "../../common/EmployeeSelectInput";
     import common_mixin from "../../../mixins/common_mixin";
     import {DatePicker} from "element-ui"
+    import {Notification as notify} from "element-ui"
 
     export default {
         mixins: [common_mixin],
@@ -109,10 +110,10 @@
                 if (this.$refs.terminationForm.checkValidity()) {
                     axios.post(`/api/employee-terminations`,
                         this.employeeTermination).then(resp => {
-                        vm.$swal({
+                        notify({
                             type: "success",
                             title: "Success",
-                            text: "Resignation successfully saved"
+                            message: "Resignation successfully saved"
                         })
                         this.$emit("terminationSaved")
                     }, error => {