fixing header border style problem,UI: Renewing Study page #1802

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

Hide file tree

Showing 4 changed files with 12 additions and 6 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
@@ -2,7 +2,7 @@ <h3 *ngIf="title">{{title}}</h3>
 <div class="j4care_dynamic_table" [ngClass]="config?.cssTableClass" *ngIf="patients && patients.length > 0">
  <!--Patient header 1:-->
  <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}">
+ <div class="td"*ngFor="let patient_table of tableSchema[hover_mode]" [ngClass]="[config?.cssTdClass || '',(patient_table.type != 'value')?'empty_td':'not_empty_td']" [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>

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
@@ -11,21 +11,27 @@
  -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;
+ padding-left: 22px;
  }
  &.series{
- padding-left: 40px;
+ padding-left: 44px;
  }
  &.instance{
- padding-left: 60px;
+ padding-left: 66px;
  }
  .td{
  float: left;
- border-right: 1px solid white;
+ //border-right: 1px solid white;
  padding: 5px 7px;
  &:last-child{
  border:none;
  }
+ &.empty_td{
+ //border-right: none;
+ }
+ &.not_empty_td{
+ border-left: 1px solid white;
+ }
  }
  }
  .tr{

diff --git a/dcm4chee-arc-ui2/src/app/helpers/dicom-studies-table/dicom-studies-table.component.ts b/dcm4chee-arc-ui2/src/app/helpers/dicom-studies-table/dicom-studies-table.component.ts
@@ -17,6 +17,7 @@ export class DicomStudiesTableComponent implements OnInit {
  @Input() title:string;
  constructor() { }
 
+ hover_mode = 'patient';
  ngOnInit() {
  this._config.offset = this._config.offset || 0;
  }

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,7 +112,6 @@ export class StudyComponent implements OnInit {
  offset:0
  }
  };
- hover_mode = 'patient';
  constructor(
  private route:ActivatedRoute,
  private service:StudyService,