Merge branch 'dev' of https://git.swopt.com/swopt/fisapp-ui

angular.json

@@ -54,6 +54,48 @@
               ],
               "outputHashing": "all"
             },
+            "production-leave": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "5000kb",
+                  "maximumError": "6mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "8kb"
+                }
+              ],
+              "outputHashing": "all",
+              "fileReplacements": [
+                {
+                  "replace": "src/app/menu/menu.ts",
+                  "with":"src/app/menu/menu.leave.ts"
+                }
+              ]
+            },
+            "production-quotation": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "5000kb",
+                  "maximumError": "6mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "8kb"
+                }
+              ],
+              "outputHashing": "all",
+              "fileReplacements": [
+                {
+                  "replace": "src/app/menu/menu.ts",
+                  "with":"src/app/menu/menu.quotation.ts"
+                }
+              ]
+            },
             "development": {
               "optimization": false,
               "extractLicenses": false,

package.json

@@ -1,14 +1,17 @@
 {
   "name": "fisapp-ui",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --port 4200",
     "build": "ng build --aot --delete-output-path",
     "build:next": "ng build --base-href /next/ --aot --delete-output-path",
     "build:prod": "ng build --configuration production --output-path dist/rc --aot --delete-output-path",
+    "build:leave:prod": "ng build --configuration production-leave --output-path dist/leave --aot --delete-output-path",
+    "build:quotation:prod": "ng build --configuration production-quotation --output-path dist/quotation --aot --delete-output-path",
     "watch": "ng build --watch --configuration development",
-    "test": "ng test"
+    "test": "ng test",
+    "clean": "ng cache clean && npm cache clean --force"
   },
   "private": true,
   "dependencies": {

src/app/app.component.html

@@ -12,9 +12,9 @@
 </style>
 <mat-toolbar class="toolbar" color="primary">
   <div class="toolbar-container">
-    <button mat-icon-button aria-label="menu">
+    <!--<button mat-icon-button aria-label="menu">
       <mat-icon>menu</mat-icon>
-    </button>
+    </button>-->
     <button mat-icon-button [routerLink]="'/'">
       <mat-icon>home</mat-icon>
     </button>
@@ -86,7 +86,8 @@
 </div>
 <footer>
   © {{currentDate.getFullYear()}} 
-  {{cs.info?.orgnProfile?.companyName}}
+  {{cs.info?.orgnProfile?.companyName}}&nbsp;
+  ({{cs.info?.orgnProfile?.company_reg_no}})
   <a class="version-short">&nbsp;ver. {{cs.info?.version}}</a>
 </footer>
 

src/app/dashboard/dashboard.component.ts

@@ -8,7 +8,7 @@ import { MasterMenuComponent } from 'angularlib/menu/master.menu/master.menu.com
 import { CommonModule } from '@angular/common';
 import { ComponentService } from 'angularlib/component.service';
 import { LabelModule } from 'angularlib/labels/label.module';
-import masterMenu from '../master.menu.json';
+import { masterMenu } from '../menu/menu';
 
 @Component({
   selector: 'app-dashboard',

src/app/menu/master.menu.json

@@ -0,0 +1,13 @@
+{
+    "leave_application":[
+        {"label":{"key":"new_leave","default":"New Leave"},"route":"/leave","queryParams":{"type":"new"}},
+        {"label":{"key":"applied_leave","default":"Applied Leave"},"route":"/leave","queryParams":{"type":"view"}},
+        {"label":{"key":"leave_approval","default":"Leave Approval"},"route":"/leave/approval"}],
+    "quotation":[
+        {"label":{"key":"sales_tender_submission","default":"Sales Tender Submission"},"route":"/tender","queryParams":{"type":"sales"}},
+        {"label":{"key":"sales_tender_award","default":"Sales Tender Award"},"route":"/tender/award","queryParams":{"type":"sales"},"disabled":true,"aria":{"key":"coming_soon","default":"Coming Soon"}}],
+    "dev_guide": [
+        {"label":{"key":"fisapp_ui_tutorial","default":"FISAPP UI Tutorial"},"url":"https://fist.swopt.com/tutorial","target":"_blank"}
+    ]
+    
+}

src/app/menu/master.menu.leave.json

@@ -0,0 +1,7 @@
+{
+    "leave_application":[
+        {"label":{"key":"new_leave","default":"New Leave"},"route":"/leave","queryParams":{"type":"new"}},
+        {"label":{"key":"applied_leave","default":"Applied Leave"},"route":"/leave","queryParams":{"type":"view"}},
+        {"label":{"key":"leave_approval","default":"Leave Approval"},"route":"/leave/approval"}
+    ]
+}

src/app/master.menu.json → src/app/menu/master.menu.quotation.json

@@ -1,5 +1,6 @@
 {
     "quotation":[
         {"label":{"key":"sales_tender_submission","default":"Sales Tender Submission"},"route":"/tender","queryParams":{"type":"sales"}},
-        {"label":{"key":"sales_tender_award","default":"Sales Tender Award"},"route":"/tender/award","queryParams":{"type":"sales"},"disabled":true,"aria":{"key":"coming_soon","default":"Coming Soon"}}]
+        {"label":{"key":"sales_tender_award","default":"Sales Tender Award"},"route":"/tender/award","queryParams":{"type":"sales"},"disabled":true,"aria":{"key":"coming_soon","default":"Coming Soon"}}
+    ]
 }

src/app/menu/menu.leave.ts

@@ -0,0 +1,3 @@
+import menu from './master.menu.leave.json';
+
+export const masterMenu = menu;

src/app/menu/menu.quotation.ts

@@ -0,0 +1,3 @@
+import menu from './master.menu.quotation.json';
+
+export const masterMenu = menu;

src/app/menu/menu.ts

@@ -0,0 +1,3 @@
+import menu from './master.menu.json';
+
+export const masterMenu = menu;

src/config/info.json

@@ -1,7 +1,8 @@
 {
     "appName":"Financial Information System",
     "orgnProfile":{
-        "companyName":"Software Optima Sdn. Bhd."
+        "companyName":"Software Optima Sdn. Bhd.",
+        "company_reg_no": "558120V"
     },
     "support":{
         "email":"support@softwareoptima.com"

src/dependencies/angularlib

@@ -1 +1 @@
-Subproject commit d805945ce01e4268c79a8713f1c06d6074f56034
+Subproject commit 4cc89ed2d88e2dcb37cbbf6b6deddc567458a60e

src/dependencies/dp-ui

@@ -1 +1 @@
-Subproject commit 9d08522a94ecc1532a048b2a738058db2c8d3456
+Subproject commit 05dfdbef4ee953b7c2d0af43190d3a20d3932a91

src/dependencies/fis

@@ -1 +1 @@
-Subproject commit baf03c281b05d81354bc027a1e43a5f8134cf7e4
+Subproject commit 04b72eb413ebd91a9fb66edeeb9185b3e332d6b0

src/manifest.webmanifest

@@ -43,5 +43,23 @@
       "type": "image/png",
       "purpose": "maskable any"
     }
+  ],
+  "shortcuts": [
+    {
+      "name": "Apply New Leave",
+      "url": "/#/leave;type=new",
+      "icons": [{
+        "src": "https://cdn.swopt.com/media/icons/leave.png",
+        "sizes": "192x192"
+      }]
+    },
+    {
+      "name": "View Sales Tender",
+      "url": "/#/tender;type=sales",
+      "icons": [{
+        "src": "https://cdn.swopt.com/media/icons/quotation.png",
+        "sizes": "192x192"
+      }]
+    }
   ]
 }