Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

layouting stuff

Browse Source
This commit is contained in:
Timo Bejan 2020-11-06 21:31:49 +02:00
parent 5f95429427
commit b6d8f343e6
7 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/red-ui/src/app/common/filter/utils/filter-utils.ts
View File

@ -3,6 +3,13 @@ import { FileStatusWrapper } from '../../../screens/file/model/file-status.wrapp
import * as moment from 'moment';
import { ProjectWrapper } from '../../../state/app-state.service';
export const RedactionFilterSorter = {
hints: 1,
redactions: 2,
requests: 3,
none: 4
};
export function handleCheckedValue(filter: FilterModel) {
if (filter.filters && filter.filters.length) {
filter.checked = filter.filters.reduce((acc, next) => acc && next.checked, true);

4
apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts
View File

@ -47,6 +47,10 @@ export class FileStatusWrapper {
return this.fileStatus.hasRequests;
}
get hasNone() {
return !this.hasRedactions && !this.hasHints && !this.hasRequests;
}
get lastUpdated() {
return this.fileStatus.lastUpdated;
}

12
apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts
View File

@ -14,7 +14,8 @@ import {
dueDateChecker,
getFilteredEntities,
projectMemberChecker,
projectStatusChecker
projectStatusChecker,
RedactionFilterSorter
} from '../../common/filter/utils/filter-utils';
import { TranslateService } from '@ngx-translate/core';
@ -171,6 +172,7 @@ export class ProjectListingScreenComponent implements OnInit {
if (file.hasHints) allDistinctNeedsWork.add('hints');
if (file.hasRedactions) allDistinctNeedsWork.add('redactions');
if (file.hasRequests) allDistinctNeedsWork.add('requests');
if (file.hasNone) allDistinctNeedsWork.add('none');
});
});
@ -198,13 +200,17 @@ export class ProjectListingScreenComponent implements OnInit {
});
});
this.needsWorkFilters = [];
const needsWorkFilters = [];
allDistinctNeedsWork.forEach((type) => {
this.needsWorkFilters.push({
needsWorkFilters.push({
key: type,
label: this._translateService.instant('filter.' + type)
});
});
needsWorkFilters.sort(
(a, b) => RedactionFilterSorter[a.key] - RedactionFilterSorter[b.key]
);
this.needsWorkFilters = needsWorkFilters;
}
public filtersChanged() {

20
apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
View File

@ -256,7 +256,10 @@
: 'report.unavailable-single'
) | translate
"
*ngIf="appStateService.isActiveProjectOwnerAndManager"
*ngIf="
appStateService.isActiveProjectOwnerAndManager &&
!isError(fileStatus)
"
[matTooltipPosition]="'above'"
>
<button
@ -272,6 +275,7 @@
(click)="assignReviewer($event, fileStatus)"
*ngIf="
appStateService.isActiveProjectMember &&
!isError(fileStatus) &&
!fileStatus.isApprovedOrUnderApproval
"
[matTooltip]="'project-overview.assign.action' | translate"
@ -327,6 +331,20 @@
>
<mat-icon svgIcon="red:undo"></mat-icon>
</button>
<redaction-status-bar
class="mr-8"
*ngIf="
!isPending(fileStatus) &&
!isProcessing(fileStatus) &&
!isError(fileStatus)
"
[config]="[
{
color: fileStatus.status,
length: 1
}
]"
></redaction-status-bar>
</div>
</div>
</div>

12
apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
View File

@ -25,7 +25,8 @@ import { FileStatusWrapper } from '../file/model/file-status.wrapper';
import {
annotationFilterChecker,
getFilteredEntities,
keyChecker
keyChecker,
RedactionFilterSorter
} from '../../common/filter/utils/filter-utils';
@Component({
@ -280,6 +281,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
if (file.hasHints) allDistinctNeedsWork.add('hints');
if (file.hasRedactions) allDistinctNeedsWork.add('redactions');
if (file.hasRequests) allDistinctNeedsWork.add('requests');
if (file.hasNone) allDistinctNeedsWork.add('none');
});
this.statusFilters = [];
@ -298,13 +300,17 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
});
});
this.needsWorkFilters = [];
const needsWorkFilters = [];
allDistinctNeedsWork.forEach((type) => {
this.needsWorkFilters.push({
needsWorkFilters.push({
key: type,
label: this._translateService.instant('filter.' + type)
});
});
needsWorkFilters.sort(
(a, b) => RedactionFilterSorter[a.key] - RedactionFilterSorter[b.key]
);
this.needsWorkFilters = needsWorkFilters;
}
filtersChanged() {

3
apps/red-ui/src/assets/i18n/en.json
View File

@ -306,7 +306,8 @@
"filter": {
"hints": "Hints",
"redactions": "Redactions",
"requests": "Requests"
"requests": "Requests",
"none": "No Annotations"
},
"annotation-filter": {
"super-type": {

4
apps/red-ui/src/assets/styles/red-page-layout.scss
View File

@ -185,6 +185,10 @@ body {
padding-right: 0 !important;
}
.mr-8 {
margin-right: 8px !important;
}
.empty-state-container {
display: flex;
justify-content: center;