เพิ่มเมนู เปิด-ปิด การใช้รายงาน Excel

src/app/DPU/common/common.module.ts

@@ -123,6 +123,11 @@ export const admin: Routes = [
       loadComponent: () =>
         import('./myportal/datasource-table/datasource-table.component').then((m) => m.DatasourceTableComponent),
     },
+    {
+      path: 'excel-report-toggle',
+      loadComponent: () =>
+        import('./myportal/set-excel-reports/excel-report-toggle/excel-report-toggle.component').then((m) => m.ExcelReportToggleComponent),
+    },
     //////////////emp/////////////////
     {
       path: 'emp/department',

src/app/DPU/common/myportal/set-excel-reports/excel-list/excel-list.component.html

@@ -217,6 +217,14 @@
             </div>
             <div class="box-footer">
                 <div class="flex items-center flex-wrap overflow-auto" *ngIf="template.filter.length > 0">
+                    <div class="d-flex justify-content-end p-2">
+                        <select class="custom-select m-r-5 border-color-gray-full-focus" style="width: auto"
+                            [(ngModel)]="pageSize" (ngModelChange)="page">
+                            <option *ngFor="let item of [10,50,100]" [ngValue]="item">
+                                {{"รายการต่อหน้า"}}: {{item}}
+                            </option>
+                        </select>
+                    </div>
                     <div class="mb-2 sm:mb-0">
                         <div>
                             {{'Showing' | translate}} {{template.filter.length}} {{'entries'
@@ -801,7 +809,7 @@
                                                 ngbDatepicker #d1="ngbDatepicker" [(ngModel)]="select[item.key]"
                                                 readonly (click)="d1.toggle()"
                                                 (ngModelChange)="formatNgbDate(item.key, select[item.key])"
-                                                #c1="ngModel" (change)="validateDate(c1)">
+                                                #c1="ngModel" (change)="validateDate(c1)" container="body">
 
                                             <!-- Calendar Button -->
                                             <button type="button"
@@ -943,7 +951,7 @@
                 <div class="flex items-center flex-wrap overflow-auto" *ngIf="valueDetailFilter().length > 0">
                     <div class="d-flex justify-content-end p-2">
                         <select class="custom-select m-r-5 border-color-gray-full-focus" style="width: auto"
-                            [(ngModel)]="pageSizeModal" (ngModelChange)="pageModal=1">
+                            [(ngModel)]="pageSizeModal" (ngModelChange)="pageModal">
                             <option *ngFor="let item of [10,50,100]" [ngValue]="item">
                                 {{"Items per page"}}: {{item}}
                             </option>

src/app/DPU/common/myportal/set-excel-reports/excel-report-toggle/excel-report-toggle.component.scss

+.ti-modal-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom-width: 1px;
+    padding-top: 0.75rem;
+    padding-bottom: 0.75rem;
+    padding-left: 1rem;
+    padding-right: 1rem;
+}
+
+::ng-deep [ngbDatepickerDayView].today {
+    background-color: #e0f2fe !important;
+}
+
+::ng-deep [ngbDatepickerDayView].bg-primary {
+    background-color: rgb(var(--primary)) !important;
+    color: #ffffff !important;
+}
+
+/* ให้ datepicker popup ทะลุ modal ได้ */
+::ng-deep ngb-datepicker,
+::ng-deep .ngb-datepicker-container {
+    z-index: 2000 !important;
+}
+
+/* เผื่อ modal มี overflow ซ่อนอยู่ */
+::ng-deep .ti-modal-content {
+    overflow: visible !important;
+}

src/app/shared/services/nav.service.ts

@@ -145,7 +145,7 @@ export class NavService implements OnDestroy {
         type: 'sub',
         children: [
           { path: '/admin/excel-list', title: 'เพิ่มรายงาน Excel', type: 'link' },
-          { path: '/admin/member-manage', title: 'เปิด-ปิด การใช้รายงาน Excel', type: 'link' }
+          { path: '/admin/excel-report-toggle', title: 'เปิด-ปิด การใช้รายงาน Excel', type: 'link' }
         ],
       },
       {