diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html index b5ed2090a..91024767a 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html @@ -26,27 +26,22 @@ translate="file-preview.tabs.annotations.select" > - +
- - - - + + + + + +
@@ -90,6 +85,7 @@ (click)="scrollQuickNavFirst()" [class.disabled]="pdf.currentPage() === 1" [matTooltip]="'file-preview.quick-nav.jump-first' | translate" + [class.documine-height]="isDocumine" class="jump" matTooltipPosition="above" > @@ -102,6 +98,7 @@ (click)="scrollQuickNavLast()" [class.disabled]="pdf.currentPage() === state.file()?.numberOfPages" [matTooltip]="'file-preview.quick-nav.jump-last' | translate" + [class.documine-height]="isDocumine" class="jump" matTooltipPosition="above" > @@ -109,7 +106,7 @@
-
+
- + + - + +
@@ -229,3 +228,19 @@ iqserPreventDefault > + + + + + + + + + diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss index fedaf987a..86cb091fa 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss @@ -33,8 +33,27 @@ display: flex; flex-direction: column; - &.documine-content { - width: var(--documine-workload-content-width); + &.documine-width { + width: calc(var(--documine-workload-content-width)); + border-right: 1px solid var(--iqser-separator); + z-index: 1; + + .workload-separator { + min-height: 37px; + background: var(--iqser-grey-8); + + .flex-align-items-center { + width: 100%; + justify-content: space-between; + + ::ng-deep span { + color: var(--iqser-text); + font-size: var(--iqser-font-size); + line-height: 20px; + font-weight: 600; + } + } + } } } @@ -53,6 +72,7 @@ .quick-navigation { border-right: 1px solid var(--iqser-separator); + border-left: 1px solid var(--iqser-separator); min-width: var(--qiuck-navigation-width); overflow: hidden; display: flex; @@ -66,6 +86,10 @@ cursor: pointer; transition: background-color 0.25s; + &.documine-height { + min-height: 37px; + } + &:not(.disabled):hover { background-color: var(--iqser-tab-hover); } diff --git a/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.html index 98a89f099..2a5a6d1c4 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.html @@ -1,92 +1,93 @@ -
-
-
-
{{ 'component-log-dialog.table-header.component' | translate }}
-
{{ 'component-log-dialog.table-header.value' | translate }}
- - +
+ + +
- -
{{ entry.name }}
-
- - - - - -
- - - - - - - - - - - - - - - - - + + + + + - - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - -
+ + + + + + + + + + + + diff --git a/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.scss b/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.scss index f245e8a71..bb1ab4bc5 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.scss @@ -1,61 +1,79 @@ -.rss-row { +.components-header { display: flex; flex-direction: row; - border-bottom: 1px solid var(--iqser-separator); - - .rss-key { - font-weight: bold; - flex: 30; - text-align: right; - padding: 4px; - } - - .rss-value { - padding: 4px; - flex: 70; - } -} - -.dialog-content { - overflow: auto; -} - -.table { - display: grid; - grid-template-columns: repeat(2, 1fr); - - > div { - padding: 8px 10px; - } - - .bold { - font-weight: 600; - } - - .table-header { - margin: 10px 0; - border-bottom: 1px solid var(--iqser-separator); - background-color: var(--iqser-grey-2); - font-weight: 600; - } -} - -.annotation-grid { - display: grid; - grid-template-columns: 3fr 1fr 1fr 5fr; -} - -ul { - margin: 0; -} - -.output-data > div:nth-child(8n + 9), -.output-data > div:nth-child(8n + 10) { - //.output-data > div:nth-child(8n + 11), - //.output-data > div:nth-child(8n + 12) { + justify-content: space-between; + align-items: center; + min-height: 36px; background: var(--iqser-grey-8); + border-bottom: 1px solid var(--iqser-separator); + padding: 0 10px; + + ::ng-deep span { + color: var(--iqser-text); + font-size: var(--iqser-font-size); + line-height: 20px; + font-weight: 600; + } } -.ml-auto { - margin-left: auto; -} +//.rss-row { +// display: flex; +// flex-direction: row; +// border-bottom: 1px solid var(--iqser-separator); +// +// .rss-key { +// font-weight: bold; +// flex: 30; +// text-align: right; +// padding: 4px; +// } +// +// .rss-value { +// padding: 4px; +// flex: 70; +// } +//} +// +//.dialog-content { +// overflow: auto; +//} +// +//.table { +// display: grid; +// grid-template-columns: repeat(2, 1fr); +// +// > div { +// padding: 8px 10px; +// } +// +// .bold { +// font-weight: 600; +// } +// +// .table-header { +// margin: 10px 0; +// border-bottom: 1px solid var(--iqser-separator); +// background-color: var(--iqser-grey-2); +// font-weight: 600; +// } +//} +// +//.annotation-grid { +// display: grid; +// grid-template-columns: 3fr 1fr 1fr 5fr; +//} +// +//ul { +// margin: 0; +//} +// +//.output-data > div:nth-child(8n + 9), +//.output-data > div:nth-child(8n + 10) { +// //.output-data > div:nth-child(8n + 11), +// //.output-data > div:nth-child(8n + 12) { +// background: var(--iqser-grey-8); +//} +// +//.ml-auto { +// margin-left: auto; +//} diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss index 4c42b4fc9..b708a86bd 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss @@ -14,10 +14,6 @@ display: flex; flex-direction: column; - &.documine-container { - width: 70%; - } - ::ng-deep .right-title { min-height: 70px; display: flex; @@ -41,6 +37,10 @@ display: flex; flex: 1; } + + &.documine-container { + width: 70%; + } } .analysis-progress { diff --git a/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.html b/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.html index 3fd4bcd55..c64f8a8ed 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.html +++ b/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.html @@ -1,3 +1,3 @@ - + diff --git a/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.ts index a9e9f6442..34f006113 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { getConfig } from '@iqser/common-ui'; @Component({ selector: 'redaction-pdf-viewer', templateUrl: './pdf-viewer.component.html', styleUrls: ['./pdf-viewer.component.scss'], }) -export class PdfViewerComponent {} +export class PdfViewerComponent { + protected readonly isDocumine = getConfig().IS_DOCUMINE; +} diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts index 78b7dee74..5a1171db9 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts @@ -275,6 +275,15 @@ export class ViewerHeaderService { updateElements(): void { this._pdf.instance?.UI.setHeaderItems(header => { + let deletedDividers = 0; + if (this.#isDocumine) { + const secondHeaderElement = header.getItems()[1] as IHeaderElement; + if (secondHeaderElement.type === 'divider') { + header.getItems().splice(1, 1); + deletedDividers = 1; + } + } + const enabledItems: IHeaderElement[] = []; const groups: HeaderElementType[][] = [ [HeaderElements.COMPARE_BUTTON, HeaderElements.CLOSE_COMPARE_BUTTON], @@ -291,8 +300,8 @@ export class ViewerHeaderService { ]; const loadAllAnnotationsButton = this.#buttons.get(HeaderElements.LOAD_ALL_ANNOTATIONS); - let startButtons = 10; - let deleteCount = 14; + let startButtons = 10 - deletedDividers; + let deleteCount = 14 - deletedDividers; groups.forEach(group => this.#pushGroup(enabledItems, group)); @@ -300,11 +309,12 @@ export class ViewerHeaderService { if (!header.getItems().includes(loadAllAnnotationsButton)) { header.get('leftPanelButton').insertAfter(loadAllAnnotationsButton); } - startButtons = 11; - deleteCount = 15; + startButtons = 11 - deletedDividers; + deleteCount = 15 - deletedDividers; } else { header.delete(HeaderElements.LOAD_ALL_ANNOTATIONS); } + header.getItems().splice(startButtons, header.getItems().length - deleteCount, ...enabledItems); }); diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 668c31b32..8722b996a 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -371,6 +371,7 @@ "annotation": { "pending": "(Pending analysis)" }, + "annotations": "", "archived-dossiers-listing": { "no-data": { "title": "No archived dossiers." @@ -508,6 +509,9 @@ "value": "Value" } }, + "component-management": { + "components": "" + }, "component-rules-screen": { "error": { "generic": "" diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 4dc4952c1..c7fbfdbc6 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -371,6 +371,7 @@ "annotation": { "pending": "(Pending analysis)" }, + "annotations": "Annotations", "archived-dossiers-listing": { "no-data": { "title": "No archived dossiers." @@ -508,6 +509,9 @@ "value": "Value" } }, + "component-management": { + "components": "Components" + }, "component-rules-screen": { "error": { "generic": "" diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 0d2ed27e0..788537d84 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -371,6 +371,7 @@ "annotation": { "pending": "(Pending analysis)" }, + "annotations": "", "archived-dossiers-listing": { "no-data": { "title": "No archived dossiers." @@ -508,6 +509,9 @@ "value": "Value" } }, + "component-management": { + "components": "" + }, "component-rules-screen": { "error": { "generic": "Something went wrong... Component rules update failed!" diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index d70100934..96ba15b16 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -371,6 +371,7 @@ "annotation": { "pending": "(Pending analysis)" }, + "annotations": "Annotations", "archived-dossiers-listing": { "no-data": { "title": "No archived dossiers." @@ -508,6 +509,9 @@ "value": "Value" } }, + "component-management": { + "components": "Components" + }, "component-rules-screen": { "error": { "generic": "Something went wrong... Component rules update failed!" diff --git a/apps/red-ui/src/assets/pdftron/stylesheet.css b/apps/red-ui/src/assets/pdftron/stylesheet.css index f441d75fc..e9ee34956 100644 --- a/apps/red-ui/src/assets/pdftron/stylesheet.css +++ b/apps/red-ui/src/assets/pdftron/stylesheet.css @@ -47,3 +47,11 @@ button.Button[data-element='LOAD_ALL_ANNOTATIONS'] > img[src='/ui/assets/icons/g opacity: 0.5; cursor: default; } + +.MainHeader { + height: 36px !important; +} + +.view-header-border { + background: rgba(226, 228, 233, 0.9); +} diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss index 4849387ca..699dc8d73 100644 --- a/apps/red-ui/src/styles.scss +++ b/apps/red-ui/src/styles.scss @@ -183,10 +183,10 @@ body { .documine-viewer { visibility: hidden; width: calc( - 100% - var(--structured-component-management-width) - var(--documine-workload-content-width) - var(--qiuck-navigation-width) + 100% - var(--structured-component-management-width) - var(--documine-workload-content-width) - var(--qiuck-navigation-width) - 3px ); height: calc(100% - calc(var(--iqser-top-bar-height) + 50px)); bottom: 0; - right: calc(var(--qiuck-navigation-width) + 1px); + right: calc(var(--qiuck-navigation-width) + 2px); position: absolute; }