Skip to content

Commit

Permalink
removing commented code, fixing pagination problem, UI: Renewing Stud…
Browse files Browse the repository at this point in the history 
…y page #1802
  • Loading branch information
@shral
shral committed Mar 13, 2019
1 parent 5674885 commit ae6d554
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 144 deletions.
142 changes: 3 additions & 139 deletions dcm4chee-arc-ui2/src/app/study/study/study.component.html
View file
Expand Up @@ -3,11 +3,6 @@
<div class="tab-content" [ngClass]="{'tab_content_with_fixed_header':fixedHeader}">
<div [ngClass]="{'fixed_header':fixedHeader}">
<h2>Studies {{studyConfig.tab}}</h2>

<!-- <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('current')" [filterTreeHeight]="filter.filterSchemaMain.lineLength" (onChange)="filterChanged()"></filter-generator>
Expand Down Expand Up @@ -37,144 +32,13 @@ <h4 [@showHide]="fixedHeader ? 'hide':'show'">Select the Location Mode</h4>
<div class="line">
<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>
<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 class="left_arrow arrow" *ngIf="patients" [ngClass]="{'active':filter.filterModel.offset > 0}" (click)="search('prev')"><span class="glyphicon glyphicon glyphicon-chevron-left"></span></div>
<div class="right_arrow arrow" *ngIf="patients" [ngClass]="{'active':moreStudies}" (click)="search('next')"><span class="glyphicon glyphicon glyphicon-chevron-right"></span></div>
<dicom-studies-table [patients]="patients" [tableSchema]="tableParam.tableSchema" [config]="tableParam.config"></dicom-studies-table>
<!-- <div class="open-close-container">
<p>The box is now!
The box is now
The box is nowThe box is nowThe box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
</p>
<p>The box is now {{ isOpen ? 'Open' : 'Closed' }}!
The box is now
The box is nowThe box is nowThe box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
</p>
<p>The box is now {{ isOpen ? 'Open' : 'Closed' }}!
The box is now
The box is nowThe box is nowThe box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
The box is now
</p>
</div>-->
<div class="left_arrow arrow" *ngIf="patients" [ngClass]="{'active':filter.filterModel.offset > 0}" (click)="search('prev')"><span class="glyphicon glyphicon glyphicon-chevron-left"></span></div>
<div class="right_arrow arrow" *ngIf="patients" [ngClass]="{'active':moreStudies}" (click)="search('next')"><span class="glyphicon glyphicon glyphicon-chevron-right"></span></div>
<dicom-studies-table [patients]="patients" [tableSchema]="tableParam.tableSchema" [config]="tableParam.config"></dicom-studies-table>
</div>
</div>
3 changes: 1 addition & 2 deletions dcm4chee-arc-ui2/src/app/study/study/study.component.ts
View file
Expand Up @@ -177,7 +177,6 @@ export class StudyComponent implements OnInit {
delete filters.aet;
if(!mode || mode === "current"){
filters.offset = 0;
this._filter.filterModel.offset = 0;
this.getStudies(filters, callingAet);
}else{
if(mode === "next" && this.moreStudies){
Expand All @@ -188,7 +187,6 @@ export class StudyComponent implements OnInit {
filters.offset = filters.offset - this._filter.filterModel.offset;
this.getStudies(filters, callingAet);
}
this._filter.filterModel.offset = filters.offset;
}
}else{
this.appService.showError("Calling AET is missing!");
Expand Down Expand Up @@ -233,6 +231,7 @@ export class StudyComponent implements OnInit {
}else{
this.appService.showMsg("No Studies found!");
}
this._filter.filterModel.offset = filters.offset;
this.cfpLoadingBar.complete();
console.log("this.patients", this.patients);
}, err => {
Expand Down
4 changes: 2 additions & 2 deletions dcm4chee-arc-ui2/src/assets/scss/old_style.scss
View file
Expand Up @@ -614,15 +614,15 @@ device and create an other one with the new name*/
border-color: #296ba0;
color: #fff;
background: url(../img/info.png);
background-color: rgba(6, 29, 47, 0.84);
background-color: rgba(28, 36, 43, 0.92);
background-size:55px;
background-position: 15px center;
background-repeat: no-repeat;
a{
color:#fff;
}
&:hover{
background-color: rgb(6, 29, 47);
background-color: rgb(28, 36, 43);
}

}
Expand Down
2 changes: 1 addition & 1 deletion dcm4chee-arc-ui2/src/styles.scss
View file
Expand Up @@ -3249,7 +3249,7 @@ $backgroundHoverColorWhite:rgba(255, 255, 255, 0.80);
border: 1px solid #444;
}
.line > input{
border-bottom: 1px solid rgba(68, 68, 68, 0.6);
border-bottom: 1px solid #ccc;
}
.filter_checkbox.active{
color: black;
Expand Down

0 comments on commit ae6d554

Please sign in to comment.