UI Navigation Tabs : Date range picker - Single Date always sets to c…

…urrent date independent of selected value in calendar #4347
dcm4che · Sep 6, 2024 · d98bb1a · d98bb1a
1 parent 43001bc
commit d98bb1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -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();
     }