From d98bb1a348730bf5388e44136fb8d29a1c7069b2 Mon Sep 17 00:00:00 2001
From: Shefki Esadi <shralsheki@gmail.com>
Date: Fri, 6 Sep 2024 12:21:57 +0200
Subject: [PATCH] UI Navigation Tabs : Date range picker - Single Date always
 sets to current date independent of selected value in calendar #4347

---
 .../src/app/widgets/range-picker/range-picker.component.html  | 4 ++--
 .../src/app/widgets/range-picker/range-picker.component.ts    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dcm4chee-arc-ui2/src/app/widgets/range-picker/range-picker.component.html b/dcm4chee-arc-ui2/src/app/widgets/range-picker/range-picker.component.html
index 1050a81bd9..82e4eb1e20 100644
--- a/dcm4chee-arc-ui2/src/app/widgets/range-picker/range-picker.component.html
+++ b/dcm4chee-arc-ui2/src/app/widgets/range-picker/range-picker.component.html
@@ -132,11 +132,11 @@ <h5>{{header}}</h5>
                 <div class="infinit" *ngIf="!(mode === 'range' || mode === 'leftOpen') && mode != 'single'">&infin;</div>
                 <date-picker
                         *ngIf="mode === 'single'"
-                        [model]="toModel"
+                        [model]="singleDateModel"
                         [format]="'yyyyMMdd'"
                         i18n-placeholder="@@placeholder.date_formated" placeholder="Date (yyyymmdd)"
                         [returnAsDateType]="true"
-                        (onValueSet)="addEvent('toModel', $event)"
+                        (onValueSet)="addEvent('singleDateModel', $event)"
                 ></date-picker>
 <!--                <mat-form-field class="material_calendar single_datepicker"  *ngIf="mode === 'single'"  [floatLabel]="'auto'">
                     <input matInput
diff --git a/dcm4chee-arc-ui2/src/app/widgets/range-picker/range-picker.component.ts b/dcm4chee-arc-ui2/src/app/widgets/range-picker/range-picker.component.ts
index 3eceb7c0a5..30f776ce91 100644
--- a/dcm4chee-arc-ui2/src/app/widgets/range-picker/range-picker.component.ts
+++ b/dcm4chee-arc-ui2/src/app/widgets/range-picker/range-picker.component.ts
@@ -302,14 +302,14 @@ export class RangePickerComponent implements OnInit {
         this.showPicker = false;
     }
     today(){
-        this.model = j4care.convertDateToString(new Date());
+        //this.model = j4care.convertDateToString(new Date());
 /*        this.modelChange.emit(this.model);
         if(this.dateRange && this.splitDateRangeChanged){
             this.splitDateRangeChanged.emit(this.SplitStudyDateRange);
         }
         this.showPicker = false;*/
         // this.filterChanged();
-        // this.singleDateModel =
+        this.singleDateModel = j4care.convertDateToString(new Date());
         this.mode = "single";
         this.setRange();
     }