diff --git a/dcm4chee-arc-ui2/src/app/study/study/study.component.html b/dcm4chee-arc-ui2/src/app/study/study/study.component.html index 77fa080e0a..900212cb43 100644 --- a/dcm4chee-arc-ui2/src/app/study/study/study.component.html +++ b/dcm4chee-arc-ui2/src/app/study/study/study.component.html @@ -3,11 +3,6 @@

Studies {{studyConfig.tab}}

- - -
@@ -37,144 +32,13 @@

Select the Location Mode

-
-
- - +
+
+ \ No newline at end of file diff --git a/dcm4chee-arc-ui2/src/app/study/study/study.component.ts b/dcm4chee-arc-ui2/src/app/study/study/study.component.ts index a0c84126d6..59748536b6 100644 --- a/dcm4chee-arc-ui2/src/app/study/study/study.component.ts +++ b/dcm4chee-arc-ui2/src/app/study/study/study.component.ts @@ -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){ @@ -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!"); @@ -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 => { diff --git a/dcm4chee-arc-ui2/src/assets/scss/old_style.scss b/dcm4chee-arc-ui2/src/assets/scss/old_style.scss index ee8effe5c7..caea151a94 100644 --- a/dcm4chee-arc-ui2/src/assets/scss/old_style.scss +++ b/dcm4chee-arc-ui2/src/assets/scss/old_style.scss @@ -614,7 +614,7 @@ 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; @@ -622,7 +622,7 @@ device and create an other one with the new name*/ color:#fff; } &:hover{ - background-color: rgb(6, 29, 47); + background-color: rgb(28, 36, 43); } } diff --git a/dcm4chee-arc-ui2/src/styles.scss b/dcm4chee-arc-ui2/src/styles.scss index 1f74c241e7..33ba53b7f4 100644 --- a/dcm4chee-arc-ui2/src/styles.scss +++ b/dcm4chee-arc-ui2/src/styles.scss @@ -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;