Skip to content

Commit

Permalink
UI: Renewing Study page #1802
Browse files Browse the repository at this point in the history
  • Loading branch information
@shral
shral committed Mar 5, 2019
1 parent f14e21c commit e44f473
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 56 deletions.
49 changes: 34 additions & 15 deletions dcm4chee-arc-ui2/src/app/models/aet.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,30 @@ export class Aet {
private _dicomApplicationCluster:string[];
private _dicomAssociationAcceptor:boolean;
private _dicomAssociationInitiator:boolean;
private _dicomNetworkConnection:any
private _dicomNetworkConnection:any;
private _value;
private _text;
private _title;

constructor(aetObject){
[
"dicomAETitle",
"dicomDescription",
"dcmAcceptedUserRole",
"dcmAllowDeletePatient",
"dcmAllowDeleteStudyPermanently",
"dicomApplicationCluster",
"dicomAssociationAcceptor",
"dicomAssociationInitiator",
"dicomNetworkConnection"
].forEach(attr=>{
if(_.hasIn(aetObject,attr))
this[attr] = aetObject[attr];
});
if(typeof aetObject === "string"){
this._dicomAETitle = aetObject;
}else{
[
"dicomAETitle",
"dicomDescription",
"dcmAcceptedUserRole",
"dcmAllowDeletePatient",
"dcmAllowDeleteStudyPermanently",
"dicomApplicationCluster",
"dicomAssociationAcceptor",
"dicomAssociationInitiator",
"dicomNetworkConnection"
].forEach(attr=>{
if(_.hasIn(aetObject,attr))
this[attr] = aetObject[attr];
});
}
}

get dcmAcceptedUserRole(): string[] {
Expand Down Expand Up @@ -99,4 +106,16 @@ export class Aet {
set dicomNetworkConnection(value: any) {
this._dicomNetworkConnection = value;
}

get value() {
return this._dicomAETitle;
}

get text() {
return this._dicomAETitle;
}

get title() {
return this._dicomDescription || this._dicomAETitle;
}
}
82 changes: 41 additions & 41 deletions dcm4chee-arc-ui2/src/app/study/study/study.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,54 @@
<study-tab></study-tab>
<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>
<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>
</mat-select>-->
<!-- <mat-select>
<mat-option *ngFor="let el of test" value="el.value"><span [innerHtml]="el.label"></span></mat-option>
</mat-select>-->

<div class="filter_line">
<div class="filter_block">
<filter-generator *ngIf="filter.filterSchemaMain.lineLength" [schema]="filter.filterSchemaMain.schema" [filterID]="'study-filter'" [model]="filter.filterModel" (submit)="search($event)" [filterTreeHeight]="filter.filterSchemaMain.lineLength" (onChange)="filterChanged()"></filter-generator>
</div>
</div>
<div class="filter_line" [hidden]="!filter.expand">
<div class="filter_block">
<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 class="filter_line">
<div class="filter_block">
<filter-generator *ngIf="filter.filterSchemaMain.lineLength" [schema]="filter.filterSchemaMain.schema" [filterID]="'study-filter'" [model]="filter.filterModel" (submit)="search($event)" [filterTreeHeight]="filter.filterSchemaMain.lineLength" (onChange)="filterChanged()"></filter-generator>
</div>
</div>
</div>
<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_line" [hidden]="!filter.expand">
<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>
<!-- <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>
<span class="manbutton_more_icon" *ngIf="moreFunctionsButtons">More configurations<i class="glyphicon glyphicon-triangle-top"></i></span>
</div>
<ul *ngIf="moreFunctionsButtons">
<li (click)="moreFunctionsButtons = false;addRetentionPolicy()" title="Set the C-MOVE SCP and STORE-SCP AETs">Add Study Retention Policy</li>
</ul>
</div>-->
<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>
<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>
<!-- <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>
<span class="manbutton_more_icon" *ngIf="moreFunctionsButtons">More configurations<i class="glyphicon glyphicon-triangle-top"></i></span>
</div>
<ul *ngIf="moreFunctionsButtons">
<li (click)="moreFunctionsButtons = false;addRetentionPolicy()" title="Set the C-MOVE SCP and STORE-SCP AETs">Add Study Retention Policy</li>
</ul>
</div>-->
</div>
</div>
</div>
</div>
</div>
</div>

<div class="open-close-container">
Expand Down

0 comments on commit e44f473

Please sign in to comment.