hidding the location mode block, removing size range default value,UI…

…: Renewing Study page #1802
dcm4che · Mar 13, 2019 · 4bfec77 · 4bfec77
1 parent 8157484
commit 4bfec77
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/dcm4chee-arc-ui2/src/app/helpers/tooltip/tooltip.directive.ts b/dcm4chee-arc-ui2/src/app/helpers/tooltip/tooltip.directive.ts
@@ -28,8 +28,6 @@ export class TooltipDirective {
  }else{
  this.showTooltip();
  }
- console.log("this.ele",this.el.nativeElement);
- console.log("this.ele",this.offset(this.el.nativeElement));
  }
  offset(el) {
  var rect = el.getBoundingClientRect(),

diff --git a/dcm4chee-arc-ui2/src/app/study/study/study.component.html b/dcm4chee-arc-ui2/src/app/study/study/study.component.html
@@ -4,19 +4,6 @@
  <div class="tab-content" [ngClass]="{'tab_content_with_fixed_header':fixedHeader}">
  <div [ngClass]="{'fixed_header':fixedHeader}">
  <h2>Studies {{studyConfig.tab}}</h2>
- <ng-container *ngIf="studyConfig.tab === 'study' || studyConfig.tab === 'patient'">
- <h4 [@showHide]="fixedHeader ? 'hide':'show'">Select the Location Mode</h4>
- <div [@showHide]="fixedHeader ? 'hide':'show'" class="controll_header">
- <mat-radio-group class="example-radio-group" [(ngModel)]="studyConfig.accessLocation" (change)="accessLocationChange($event)">
- <mat-radio-button value="internal" >
- Internal
- </mat-radio-button>
- <mat-radio-button value="external" >
- External
- </mat-radio-button>
- </mat-radio-group>
- </div>
- </ng-container>
 
  <!-- <mat-select>
  <mat-option *ngFor="let el of test" value="el.value"><span [innerHtml]="el.label"></span></mat-option>
@@ -32,12 +19,25 @@ <h4 [@showHide]="fixedHeader ? 'hide':'show'">Select the Location Mode</h4>
  <filter-generator *ngIf="filter.filterSchemaMain.lineLength" [schema]="filter.filterSchemaExpand.schema" [filterID]="'study-filter'" [model]="filter.filterModel" [filterTreeHeight]="filter.filterSchemaExpand.lineLength" (onChange)="filterChanged()"></filter-generator>
  </div>
  </div>
+ <ng-container *ngIf="(studyConfig.tab === 'study' || studyConfig.tab === 'patient') && filter.expand">
+ <h4 [@showHide]="fixedHeader ? 'hide':'show'">Select the Location Mode</h4>
+ <div [@showHide]="fixedHeader ? 'hide':'show'" class="controll_header">
+ <mat-radio-group class="example-radio-group" [(ngModel)]="studyConfig.accessLocation" (change)="accessLocationChange($event)">
+ <mat-radio-button value="internal" >
+ Internal
+ </mat-radio-button>
+ <mat-radio-button value="external" >
+ External
+ </mat-radio-button>
+ </mat-radio-group>
+ </div>
+ </ng-container>
  <div class="filter_line" [@showHide]="fixedHeader ? 'hide':'show'">
  <div class="filter single_block" [permission]="{id:'action-monitoring->diff_monitor-all_action',param:'visible'}">
  <div class="filter_block">
  <div class="line">
- <a href="" (click)="$event.preventDefault();filter.expand=true" *ngIf="!filter.expand" class="more pull-left">More filters<i class="glyphicon glyphicon-triangle-bottom"></i></a>
- <a href="" (click)="$event.preventDefault();filter.expand=false" *ngIf="filter.expand" class="more [hidden] pull-left">Close more filters<i class="glyphicon glyphicon-triangle-top"></i></a>
+ <a href="" (click)="$event.preventDefault();filter.expand=true" *ngIf="!filter.expand" class="more pull-left">More<i class="glyphicon glyphicon-triangle-bottom"></i></a>
+ <a href="" (click)="$event.preventDefault();filter.expand=false" *ngIf="filter.expand" class="more [hidden] pull-left">Close More Block<i class="glyphicon glyphicon-triangle-top"></i></a>
  <!-- <div class="more functions" (clickOutside)="moreFunctionsButtons = false" [clickOutsideExceptionClass]="['mainbutton','manbutton_more_icon']">
  <div class="mainbutton" (click)="moreFunctionsButtons = !moreFunctionsButtons">
  <span class="manbutton_more_icon" *ngIf="!moreFunctionsButtons" >More configurations<i class="glyphicon glyphicon-triangle-bottom"></i></span>

diff --git a/dcm4chee-arc-ui2/src/app/study/study/study.component.ts b/dcm4chee-arc-ui2/src/app/study/study/study.component.ts
@@ -75,8 +75,7 @@ export class StudyComponent implements OnInit {
  },
  filterModel:{
  limit:20,
- offset:0,
- StudySizeInKB:'1000-'
+ offset:0
  },
  expand:false,
  quantityText:{
@@ -140,6 +139,7 @@ export class StudyComponent implements OnInit {
  if(html.scrollTop > 63){
  this.fixedHeader = true;
  this.testShow = false;
+ this.filter.expand = false;
  }else{
  this.fixedHeader = false;
  this.testShow = true;