Forráskód Böngészése

added leave component

tigger 1 éve
szülő
commit
95c2538366

+ 3 - 1
src/app/app.routes.ts

@@ -2,9 +2,11 @@ import { Routes } from '@angular/router';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { SubmissionComponent } from 'fis/submission/submission.component';
 import { AuthGuard } from 'angularlib/login';
+import { LeaveComponent } from 'fis/leave/new/leave.component';
 
 export const routes: Routes = [
     { path: '', redirectTo: '/dashboard', pathMatch: 'full' },
     { path:'dashboard', component: DashboardComponent, data: {title: 'FIS App'}},
-    { path:'submission', component: SubmissionComponent, canActivate: [AuthGuard]}
+    { path:'submission', component: SubmissionComponent, canActivate: [AuthGuard]},
+    { path:'leave', component: LeaveComponent, canActivate: [AuthGuard]}
 ];

+ 2 - 1
src/app/dashboard/dashboard.component.scss

@@ -141,7 +141,8 @@ main {
 }
 
 .social-links {
-  display: flex;
+  display: none;
+  //display: flex;
   align-items: center;
   gap: 0.73rem;
   margin-top: 1.5rem;

+ 3 - 3
src/app/master.menu.json

@@ -1,8 +1,8 @@
 {
     "leave_application":[
-        {"label":{"key":"new_leave","default":"New Leave"},"route":"/leave"},
-        {"label":{"key":"leave_history","default":"Leave History"},"route":"/leave/history"},
-        {"label":{"key":"leave_approval","default":"Leave Approval"},"route":"/leave/approval","disabled":true}],
+        {"label":{"key":"new_leave","default":"New Leave"},"route":"/leave","queryParams":{"type":"new"}},
+        {"label":{"key":"applied_leave","default":"Applied Leave"},"route":"/leave","queryParams":{"type":"applied"}},
+        {"label":{"key":"leave_approval","default":"Leave Approval"},"route":"/leave","queryParams":{"type":"approval"},"disabled":true}],
     "quotation":[
         {"label":{"key":"sales_tender_submission","default":"Sales Tender Submission"},"route":"/submission","queryParams":{"type":"sales"}},
         {"label":{"key":"sales_tender_award","default":"Sales Tender Award"},"route":"/quotation/award","queryParams":{"type":"sales"}}]

+ 1 - 1
src/dependencies/angularlib

@@ -1 +1 @@
-Subproject commit 41fc1a9abbc9923c937feb27967c3fe0b759bd2b
+Subproject commit ff4e3928800d9b43d59849088bb3791ae3b17196

+ 1 - 1
src/dependencies/fis

@@ -1 +1 @@
-Subproject commit 1d0f5e1283bd98cc5ab99671ee0d066045d11aa3
+Subproject commit ce7bbceda4c2ce5bcb30b99e27c76ec17dc11876

+ 1 - 1
src/dependencies/fis-commons

@@ -1 +1 @@
-Subproject commit 23fe1c4a0cc6ba9d75c65c9865bf24bee3591026
+Subproject commit 967de958083e0dab0d9cedb91f6282a645121516