Merge pull request 'logger manager to activity logs' (#46) from mazdak/UX-2219 into dev-pending-20-01-2026

Reviewed-on: https://ct.mfsys.com.pk/aConnect/aConnect-UX/pulls/46

src/app/app.routes.ts

@@ -61,7 +61,7 @@ export const routes: Routes = [
                     )
             },
             {
-                path: 'loggerManager',
+                path: 'activityLogs',
                 canActivate: [ActivityGuard],
                 loadComponent: () =>
                     import('./logging/logging.component').then(

src/app/logging/logging.component.html

@@ -1,16 +1,27 @@
 <div id="layout-wrapper">
   <div class="inner-pg-sp">
+
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-12">
+          <div
+            class="d-sm-flex align-items-center justify-content-between navbar-header p-0"
+          ></div>
+        </div>
+      </div>
+    </div>
+    
     <div class="container-fluid">
       <!-- SEARCH FORM -->
       <div class="col-xl-12 mt-4">
         <div class="card border">
           <div class="card-body">
-            <div class="card-header font-edit-13-child">
-              {{ "loggerManager" | translate }}
+            <div class="card-header font-edit-13-child mb-3">
+              {{ "activityLogs" | translate }}
             </div>
 
             <form [formGroup]="logsSearchForm">
-              <div class="row g-3 mb-3">
+              <div class="row g-3 mb-3 ">
                 <div class="col-md-6">
                   <label>
                     {{ "fromDate" | translate }}
@@ -20,6 +31,7 @@
                     type="date"
                     formControlName="fromDate"
                     class="form-control"
+                    [max]="maxDate"
                   />
                 </div>
 
@@ -31,6 +43,7 @@
                     type="date"
                     formControlName="toDate"
                     class="form-control"
+                    [max]="maxDate"
                   />
                 </div>
               </div>
@@ -52,10 +65,11 @@
       <!-- TABLE -->
       <div class="col-xl-12 mt-4">
         <div class="card border">
+          <div class="card-body">
           <div
-            class="card-header d-flex justify-content-between align-items-center"
+            class="card-header d-flex justify-content-between align-items-center font-edit-13-child"
           >
-            {{ "loggerManagerDetails" | translate }}
+            {{ "activityLogDetails" | translate }}
 
             <div class="d-flex gap-2" *ngIf="allItems.length">
               <input
@@ -82,7 +96,7 @@
               </i>
             </div>
           </div>
-
+          </div>
           <div class="card-body" *ngIf="logsDataExpanded">
             <!-- NO RECORDS -->
             <div *ngIf="!filteredItems.length" class="text-center text-muted">

src/app/logging/logging.component.ts

@@ -40,7 +40,7 @@ export class LoggingComponent implements OnInit {
   pageSizeOptions = pageSizeOptions;
   itemsPerPage = 10;
   currentPage = 1;
-
+  maxDate: string;
   searchText = '';
 
   logsDataExpanded = true;
@@ -56,7 +56,9 @@ export class LoggingComponent implements OnInit {
     private httpService: HttpURIService,
     private datePipe: DatePipe,
     private excelExportService: ExcelExportService,
-  ) {}
+  ) {
+    this.maxDate = new Date().toISOString().split('T')[0];
+  }
 
   ngOnInit(): void {
     this.logsSearchForm = this.fb.group(

src/app/shared/components/side-nav/side-nav.component.html

@@ -43,8 +43,8 @@
                 </a>
                 <ul class="sub-menu" aria-expanded="false">
                     <li *ngIf="permissions.loggerManager || authService.isAdminUser()">
-                        <a routerLink="/home/loggerManager" routerLinkActive="mm-active">
-                            <span> {{ 'loggerManager' | translate }}</span>
+                        <a routerLink="/home/activityLogs" routerLinkActive="mm-active">
+                            <span> {{ 'activityLogs' | translate }}</span>
                         </a>
                     </li>
                     <li *ngIf="permissions.transactionLogs || authService.isAdminUser()">

src/app/transaction-logs/transaction-logs.component.ts

@@ -25,7 +25,7 @@ throw new Error('Method not implemented.');
   totalCount: number = 0;
   renewalDataExpanded: boolean = true;
   pageSizeOptions = pageSizeOptions;
-  itemsPerPage: number = 5;
+  itemsPerPage: number = 10;
   transactionLog: TransactionLog[] = [];
   isLoading = false;
   pagedItems: any[] = [];

src/app/user-management/setup-user/setup-user.component.ts

@@ -32,7 +32,7 @@ export class SetupUserComponent implements OnInit {
   allItems: SetupUser[] = [];
   currentPage: number = 1;
   pageSizeOptions = pageSizeOptions
-  itemsPerPage: number = 5;
+  itemsPerPage: number = 10;
   pagedItems: any[] = [];
   searchText: any = '';
   renewalDataExpanded: boolean = true;

src/assets/data/sideMenu.json

@@ -77,8 +77,8 @@
     "expanded": false,
     "children": [
       {
-        "name": "loggerManager",
-        "route": "/home/loggerManager",
+        "name": "activityLogs",
+        "route": "/home/activityLogs",
         "checked": false,
         "expanded": false,
         "children": []

src/assets/i18n/Arabic.json

@@ -266,6 +266,7 @@
     "emptySpaceRestriction": "المسافات الفارغة غير مسموح بها",
     "USER_CREATED_SUCCESS": "تم إنشاء المستخدم",
     "USER_DELETE_SUCCESS": "تم حذف المستخدم",
-    "SAVED_SUCCESSFULLY": "تم الحفظ بنجاح"
-
+    "SAVED_SUCCESSFULLY": "تم الحفظ بنجاح",
+    "activityLogs": "سجلات النشاط",
+    "activityLogDetails": "تفاصيل سجل النشاط"
 }

src/assets/i18n/English.json

@@ -252,7 +252,7 @@
     "choose" : "Choose",
     "allow": "Allow",
     "toDateInvalidError": "To Date must be greater than or equal to From Date",
-    "noLoggingDetailsFound": "No Logging Details found",
+    "noLoggingDetailsFound": "No Activity Log Details found",
     "noUserDetailsFound":"No User Details found",
     "noThirdPartyRegFound":"No Third Party Registration Details Found",
     "ERR_SEC_0001": "Email already exists",
@@ -269,5 +269,7 @@
     "USER_CREATED_SUCCESS": "User Created",
     "USER_DELETE_SUCCESS": "User Deleted",
     "SAVED_SUCCESSFULLY" :"Saved Successfully",
-    "oldAndNewPass":"Old password and new password cannot be the same"
+    "oldAndNewPass":"Old password and new password cannot be the same",
+    "activityLogs": "Activity Logs",
+    "activityLogDetails": "Activity Log Details"
 }