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

new UI enhancements

tigger 2 hete
szülő
commit
c56369f5d1

+ 1 - 1
src/app/app.component.html

@@ -134,7 +134,7 @@
         (click)="cs.isMobileClient? sidenav.close():undefined"
         [queryParams]="item.queryParams"
         matBadge="{{item.badge}}" replaceUrl="{{item.path==='/'?'true':'false'}}"
-        [ngClass]="{'active':router.isActive(item.path,true)}"
+        [ngClass]="{'active':router.isActive(item.path,{paths:'exact',queryParams:'ignored'})}"
       >
         <mat-icon>{{item.icon}}</mat-icon>
         <span>{{item.title.key?(item.title.key|tr:item.title.default):item.title}}</span>

+ 2 - 2
src/app/app.component.ts

@@ -64,7 +64,7 @@ import { AppService } from 'angularlib/app';
     BusinessDataModule,
     ChatComponent,
   ],
-  providers: [DatePipe, FISMessaging],
+  providers: [DatePipe, FISMessaging, FISPrograms],
   templateUrl: './app.component.html',
   changeDetection: ChangeDetectionStrategy.Eager,
   styleUrls: ['./app.component.scss'],
@@ -138,7 +138,7 @@ export class AppComponent extends BaseComponent implements OnInit {
     ],
   };
 
-  protected programs = signal(FISPrograms);
+  protected programs = signal(inject(FISPrograms).list);
 
   private http = inject(HttpClient);
 

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

@@ -82,11 +82,13 @@ main {
   align-items: center;
 }
 
-.content .left,.right {
+.content .right {
   flex-grow: 1;
   min-width: 17%;
 }
 
+
+
 .content .center {
   flex-grow: 1;
   height: 100%;

+ 6 - 1
src/assets/language.packs/en_US.json

@@ -4734,5 +4734,10 @@
     "scroll_to_top": "Scroll to top",
     "scroll_to_bottm": "Scroll to bottom",
     "eleave": "eLeave",
-    "spts": "SPTS"
+    "spts": "SPTS",
+    "closes_in": "Closes in",
+    "dt_days":"day(s)",
+    "dt_hours":"hour(s)",
+    "dt_minutes":"minute(s)",
+    "dt_seconds":"second(s)"
 }

+ 6 - 1
src/assets/language.packs/ms_MY.json

@@ -4717,5 +4717,10 @@
     "scroll_to_top": "Skrol ke atas",
     "scroll_to_bottm": "Skrol ke bawah",
     "eleave": "eLeave Pengendalian Cuti",
-    "spts": "SPTS Pengendalian Sebut Harga"
+    "spts": "SPTS Pengendalian Sebut Harga",
+    "closes_in": "Berakhir dalam",
+    "dt_days":"hari",
+    "dt_hours":"jam",
+    "dt_minutes":"minit",
+    "dt_seconds":"saat"
 }

+ 6 - 1
src/assets/language.packs/zh_Hans.json

@@ -4687,5 +4687,10 @@
     "scroll_to_top": "滚动至最顶",
     "scroll_to_bottm": "滚动至最尾",
     "eleave": "eLeave 假期系统",
-    "spts": "SPTS 销售和采购报价系统"
+    "spts": "SPTS 销售和采购报价系统",
+    "closes_in": "剩余时间",
+    "dt_days":"日",
+    "dt_hours":"时",
+    "dt_minutes":"分",
+    "dt_seconds":"秒"
 }

+ 1 - 1
src/dependencies/angularlib

@@ -1 +1 @@
-Subproject commit 6452d672bf2be318b4c67a82898b54c932c683eb
+Subproject commit 871d642161a26e24bda58753e213f62293a3b073

+ 1 - 1
src/dependencies/fis

@@ -1 +1 @@
-Subproject commit 97e380936f7b74d2315d01741b979185ab401dc6
+Subproject commit 7c4e6bdb29e34c10225dfa7ef977b358f5eefd6d