adding other headers, UI: Renewing Study page #1802

dcm4che · Mar 8, 2019 · 0d76aac · 0d76aac
1 parent deec425
commit 0d76aac
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/dcm4chee-arc-ui2/src/app/helpers/dicom-studies-table/dicom-studies-table.component.html b/dcm4chee-arc-ui2/src/app/helpers/dicom-studies-table/dicom-studies-table.component.html
@@ -1,17 +1,17 @@
 <h3 *ngIf="title">{{title}}</h3>
 <div class="j4care_dynamic_table" [ngClass]="config?.cssTableClass" *ngIf="patients && patients.length > 0">
  <!--Patient header 1:-->
- <div class="th patient" [ngClass]="config?.cssThClass">
- <div class="td"*ngFor="let patient_table of tableSchema.patient" [ngClass]="config?.cssTdClass" [ngStyle]="{width: patient_table.calculatedWidth}">
- <ng-container *ngIf="patient_table.type === 'value'">{{patient_table.header}}</ng-container>
- <ng-container *ngIf="patient_table.type != 'value'">&nbsp;</ng-container>
+ <div class="th {{hover_mode}}" [ngClass]="config?.cssThClass">
+ <div class="td"*ngFor="let patient_table of tableSchema[hover_mode]" [ngClass]="config?.cssTdClass" [ngStyle]="{width: patient_table.calculatedWidth}">
+ <ng-container *ngIf="patient_table.type === 'value'">{{patient_table.header}}</ng-container>
+ <ng-container *ngIf="patient_table.type != 'value'">&nbsp;</ng-container>
+ </div>
  </div>
- </div>
  <!--1:END;-->
 
  <!--Patient Table 1:-->
  <div class="tr" [ngClass]="config?.cssTrClass" *ngFor="let patient of patients;let i = index">
- <div class="patient_block table_item">
+ <div class="patient_block table_item" (mouseenter)="hover_mode = 'patient'">
  <div class="td" *ngFor="let patient_table of tableSchema.patient" [ngClass]="config?.cssTdClass" [ngStyle]="{width: patient_table.calculatedWidth}" [ngSwitch]="patient_table.type">
  <ng-container *ngSwitchCase="'index'">{{i + config.offset + 1}}</ng-container>
  <ng-container *ngSwitchCase="'actions'">
@@ -29,7 +29,7 @@ <h3 *ngIf="title">{{title}}</h3>
  <!--Studies 2:-->
  <div *ngIf="patient.showStudies" class="study_main_block">
  <div class="tr" [ngClass]="config?.cssTrClass" *ngFor="let study of patient.studies;let i = index">
- <div class="study_block table_item">
+ <div class="study_block table_item" (mouseenter)="hover_mode = 'studies'">
  <div class="td" *ngFor="let studies_table of tableSchema.studies" [ngClass]="config?.cssTdClass" [ngStyle]="{width: studies_table.calculatedWidth}" [ngSwitch]="studies_table.type">
  <ng-container *ngSwitchCase="'index'">{{study.offset + 1}}</ng-container>
  <ng-container *ngSwitchCase="'actions'">
@@ -46,7 +46,7 @@ <h3 *ngIf="title">{{title}}</h3>
  <!--Series 3:-->
  <div *ngIf="study.showSeries" class="series_main_block">
  <div class="tr" [ngClass]="config?.cssTrClass" *ngFor="let serie of study.series;let i = index">
- <div class="series_block table_item">
+ <div class="series_block table_item" (mouseenter)="hover_mode = 'series'">
  <div class="td" *ngFor="let serie_table of tableSchema.series" [ngClass]="config?.cssTdClass" [ngStyle]="{width: serie_table.calculatedWidth}" [ngSwitch]="serie_table.type">
  <ng-container *ngSwitchCase="'index'">{{i + 1}}</ng-container>
  <ng-container *ngSwitchCase="'actions'">
@@ -64,7 +64,7 @@ <h3 *ngIf="title">{{title}}</h3>
  <!--Instance 4:-->
  <div *ngIf="serie.showInstances" class="instance_main_block">
  <div class="tr" [ngClass]="config?.cssTrClass" *ngFor="let instance of serie.instances;let i = index">
- <div class="instance_block table_item">
+ <div class="instance_block table_item" (mouseenter)="hover_mode = 'instance'">
  <div class="td" *ngFor="let instance_table of tableSchema.instance" [ngClass]="config?.cssTdClass" [ngStyle]="{width: instance_table.calculatedWidth}" [ngSwitch]="instance_table.type">
  <ng-container *ngSwitchCase="'index'">{{i + 1}}</ng-container>
  <ng-container *ngSwitchCase="'actions'">

diff --git a/dcm4chee-arc-ui2/src/app/helpers/dicom-studies-table/dicom-studies-table.component.scss b/dcm4chee-arc-ui2/src/app/helpers/dicom-studies-table/dicom-studies-table.component.scss
@@ -10,6 +10,15 @@
  -webkit-box-shadow: 5px 3px 13px 0px rgba(68, 68, 68, 0.93) ;
  -moz-box-shadow: 5px 3px 13px 0px rgba(68, 68, 68, 0.93) ;
  box-shadow: 5px 3px 13px 0px rgba(68, 68, 68, 0.93) ;
+ &.studies{
+ padding-left: 20px;
+ }
+ &.series{
+ padding-left: 40px;
+ }
+ &.instance{
+ padding-left: 60px;
+ }
  .td{
  float: left;
  border-right: 1px solid white;

diff --git a/dcm4chee-arc-ui2/src/app/study/study/study.component.ts b/dcm4chee-arc-ui2/src/app/study/study/study.component.ts
@@ -112,6 +112,7 @@ export class StudyComponent implements OnInit {
  offset:0
  }
  };
+ hover_mode = 'patient';
  constructor(
  private route:ActivatedRoute,
  private service:StudyService,
@@ -137,7 +138,7 @@ export class StudyComponent implements OnInit {
  @HostListener("window:scroll", [])
  onWindowScroll(e) {
  let html = document.documentElement;
- if(html.scrollTop > 73){
+ if(html.scrollTop > 63){
  this.fixedHeader = true;
  this.testShow = false;
  }else{

diff --git a/dcm4chee-arc-ui2/src/styles.scss b/dcm4chee-arc-ui2/src/styles.scss
@@ -2633,6 +2633,7 @@ dicom-list{
  width: calc(100% - 80px) !important;
  }
  }
+
 }
 
 /* New black and white design*/