Merge branch 'dev-pending-20-01-2026' into osho-marka

src/app/logging/logging.component.html

@@ -36,6 +36,11 @@
                     />
                     <i class="fas fa-calendar calendar-icon"></i>
                   </div>
+                  <div class="text-danger"
+                    *ngIf="logsSearchForm.get('fromDate')?.touched && logsSearchForm.get('fromDate')?.invalid">
+                    {{ 'fieldRequired' | translate }}
+                  </div>
+                  
                 </div>
 
                 <div class="col-md-6">
@@ -51,6 +56,16 @@
                     />
                     <i class="fas fa-calendar calendar-icon"></i>
                   </div>
+                  <div class="text-danger"
+                    *ngIf="logsSearchForm.get('toDate')?.touched && logsSearchForm.get('toDate')?.invalid">
+                    {{ 'fieldRequired' | translate }}
+                  </div>
+                  <div class="text-danger" *ngIf="
+                      logsSearchForm.touched &&
+                      logsSearchForm.errors?.['fromDateGreaterThanOrEqualToToDate']
+                    ">
+                    {{ 'toDateInvalidError' | translate }}
+                  </div>
                 </div>
               </div>
 

src/app/logging/logging.component.ts

@@ -162,8 +162,22 @@ export class LoggingComponent implements OnInit {
   }
 
   exportDataInExcel(): void {
+    const sanitizedData = this.filteredItems.map(item => {
+    if (item.requestBody) {
+      try {
+        const body = JSON.parse(item.requestBody);
+        if (body.password) {
+          body.password = '******'; 
+        }
+        return { ...item, requestBody: JSON.stringify(body) };
+      } catch {
+        return item;
+      }
+    }
+    return item;
+  });
     this.excelExportService.exportExcel(
-      this.filteredItems,
+      sanitizedData,    
       LOGGING_DETAILS_FILE_NAME,
     );
   }

src/app/utils/app.constants.ts

@@ -30,7 +30,7 @@ export const toDateAfterFromDateValidator: ValidatorFn = (
   today.setHours(0, 0, 0, 0);
 
   // Rule 1: fromDate must be < toDate
-  if (fromDate >= toDate) {
+  if (fromDate > toDate) {
     return { fromDateGreaterThanOrEqualToToDate: true };
   }