diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 2061c9c12..4a62abebb 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -1042,7 +1042,7 @@ src/app/components/document-list/document-list.component.html - 209 + 211 src/app/data/document.ts @@ -1926,7 +1926,7 @@ src/app/components/document-list/document-list.component.html - 236 + 238 src/app/data/document.ts @@ -2716,7 +2716,7 @@ src/app/components/document-list/document-list.component.html - 191 + 193 src/app/components/document-list/filter-editor/filter-editor.component.html @@ -3321,7 +3321,7 @@ src/app/components/document-list/document-list.component.html - 245 + 247 src/app/data/document.ts @@ -5429,7 +5429,7 @@ src/app/components/document-list/document-list.component.html - 275 + 277 @@ -5444,7 +5444,7 @@ src/app/components/document-list/document-list.component.html - 310 + 312 @@ -5459,7 +5459,7 @@ src/app/components/document-list/document-list.component.html - 317 + 319 @@ -5749,7 +5749,7 @@ src/app/components/document-list/document-list.component.html - 188 + 190 src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -5790,7 +5790,7 @@ src/app/components/document-list/document-list.component.html - 179 + 180 src/app/components/document-list/filter-editor/filter-editor.component.html @@ -5817,7 +5817,7 @@ src/app/components/document-list/document-list.component.html - 218 + 220 src/app/components/document-list/filter-editor/filter-editor.component.html @@ -5844,7 +5844,7 @@ src/app/components/document-list/document-list.component.html - 227 + 229 src/app/components/document-list/filter-editor/filter-editor.component.html @@ -6645,7 +6645,7 @@ src/app/components/document-list/document-list.component.html - 286 + 288 @@ -6847,14 +6847,14 @@ Sort by ASN src/app/components/document-list/document-list.component.html - 166 + 167 ASN src/app/components/document-list/document-list.component.html - 170 + 171 src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -6873,28 +6873,28 @@ Sort by correspondent src/app/components/document-list/document-list.component.html - 175 + 176 Sort by title src/app/components/document-list/document-list.component.html - 184 + 185 Sort by owner src/app/components/document-list/document-list.component.html - 196 + 198 Owner src/app/components/document-list/document-list.component.html - 200 + 202 src/app/data/document.ts @@ -6909,56 +6909,56 @@ Sort by notes src/app/components/document-list/document-list.component.html - 205 + 207 Sort by document type src/app/components/document-list/document-list.component.html - 214 + 216 Sort by storage path src/app/components/document-list/document-list.component.html - 223 + 225 Sort by created date src/app/components/document-list/document-list.component.html - 232 + 234 Sort by added date src/app/components/document-list/document-list.component.html - 241 + 243 Shared src/app/components/document-list/document-list.component.html - 248,250 + 250,252 Edit document src/app/components/document-list/document-list.component.html - 282 + 284 Yes src/app/components/document-list/document-list.component.html - 333 + 335 src/app/pipes/yes-no.pipe.ts @@ -6969,7 +6969,7 @@ No src/app/components/document-list/document-list.component.html - 333 + 335 src/app/pipes/yes-no.pipe.ts diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index b0a5b92e6..d44880d0f 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -157,191 +157,194 @@ } @if (list.displayMode === DisplayMode.TABLE) { - - - - @if (activeDisplayFields.includes(DisplayField.ASN)) { - - } - @if (activeDisplayFields.includes(DisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { - - } - @if (activeDisplayFields.includes(DisplayField.TITLE)) { - - } - @if (activeDisplayFields.includes(DisplayField.TAGS) && !activeDisplayFields.includes(DisplayField.TITLE)) { - - } - @if (activeDisplayFields.includes(DisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { - - } - @if (activeDisplayFields.includes(DisplayField.NOTES) && notesEnabled) { - - } - @if (activeDisplayFields.includes(DisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { - - } - @if (activeDisplayFields.includes(DisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { - - } - @if (activeDisplayFields.includes(DisplayField.CREATED)) { - - } - @if (activeDisplayFields.includes(DisplayField.ADDED)) { - - } - @if (activeDisplayFields.includes(DisplayField.SHARED)) { - - } - @for (field of activeDisplayCustomFields; track field) { - - } - - - @for (d of list.documents; track trackByDocumentId($index, d)) { - - - @if (activeDisplayFields.includes(DisplayField.ASN)) { - + } + @if (activeDisplayFields.includes(DisplayField.TITLE) || activeDisplayFields.includes(DisplayField.TAGS)) { + + } + @if (activeDisplayFields.includes(DisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { + + } + @if (activeDisplayFields.includes(DisplayField.NOTES) && notesEnabled) { + + } + @if (activeDisplayFields.includes(DisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { + + } + @if (activeDisplayFields.includes(DisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { + + } + @if (activeDisplayFields.includes(DisplayField.CREATED)) { + + } + @if (activeDisplayFields.includes(DisplayField.ADDED)) { + + } + @if (activeDisplayFields.includes(DisplayField.SHARED)) { + + } + @for (field of activeDisplayCustomFields; track field) { + + } + + } + +
ASNCorrespondentTitleTagsOwnerNotesDocument typeStorage pathCreatedAdded - Shared - - {{getDisplayCustomFieldTitle(field)}} -
-
- - -
-
- {{d.archive_serial_number}} +
+ + + + @if (activeDisplayFields.includes(DisplayField.ASN)) { + + } + @if (activeDisplayFields.includes(DisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { + + } + @if (activeDisplayFields.includes(DisplayField.TITLE)) { + + } + @if (activeDisplayFields.includes(DisplayField.TAGS) && !activeDisplayFields.includes(DisplayField.TITLE)) { + + } + @if (activeDisplayFields.includes(DisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { + + } + @if (activeDisplayFields.includes(DisplayField.NOTES) && notesEnabled) { + + } + @if (activeDisplayFields.includes(DisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { + + } + @if (activeDisplayFields.includes(DisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { + + } + @if (activeDisplayFields.includes(DisplayField.CREATED)) { + + } + @if (activeDisplayFields.includes(DisplayField.ADDED)) { + + } + @if (activeDisplayFields.includes(DisplayField.SHARED)) { + + } + @for (field of activeDisplayCustomFields; track field) { + + } + + + @for (d of list.documents; track trackByDocumentId($index, d)) { + + - } - @if (activeDisplayFields.includes(DisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { - - } - @if (activeDisplayFields.includes(DisplayField.TITLE) || activeDisplayFields.includes(DisplayField.TAGS)) { - + } + @if (activeDisplayFields.includes(DisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { + - } - @if (activeDisplayFields.includes(DisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { - - } - @if (activeDisplayFields.includes(DisplayField.NOTES) && notesEnabled) { - - } - @if (activeDisplayFields.includes(DisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { - - } - @if (activeDisplayFields.includes(DisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { - - } - @if (activeDisplayFields.includes(DisplayField.CREATED)) { - - } - @if (activeDisplayFields.includes(DisplayField.ADDED)) { - - } - @if (activeDisplayFields.includes(DisplayField.SHARED)) { - - } - @for (field of activeDisplayCustomFields; track field) { - - } - - } - -
ASNCorrespondentTitleTagsOwnerNotesDocument typeStorage pathCreatedAdded + Shared + + {{getDisplayCustomFieldTitle(field)}} +
+
+ + +
- @if (d.correspondent) { - {{(d.correspondent$ | async)?.name}} - } - - @if (activeDisplayFields.includes(DisplayField.TITLE)) { - {{d.title | documentTitle}} - } - @if (activeDisplayFields.includes(DisplayField.TAGS)) { - @for (t of d.tags$ | async; track t) { - + @if (activeDisplayFields.includes(DisplayField.ASN)) { + + {{d.archive_serial_number}} + + @if (d.correspondent) { + {{(d.correspondent$ | async)?.name}} } - } - - {{d.owner | username}} - - @if (d.notes.length) { - - - - {{d.notes.length}} - - } - - @if (d.document_type) { - {{(d.document_type$ | async)?.name}} - } - - @if (d.storage_path) { - {{(d.storage_path$ | async)?.name}} - } - - {{d.created_date | customDate}} - - {{d.added | customDate}} - - @if (d.is_shared_by_requester) { Yes } @else { No } - - -
+
+ @if (activeDisplayFields.includes(DisplayField.TITLE)) { + {{d.title | documentTitle}} + } + @if (activeDisplayFields.includes(DisplayField.TAGS)) { + @for (t of d.tags$ | async; track t) { + + } + } + + {{d.owner | username}} + + @if (d.notes.length) { + + + + {{d.notes.length}} + + } + + @if (d.document_type) { + {{(d.document_type$ | async)?.name}} + } + + @if (d.storage_path) { + {{(d.storage_path$ | async)?.name}} + } + + {{d.created_date | customDate}} + + {{d.added | customDate}} + + @if (d.is_shared_by_requester) { Yes } @else { No } + + +
+ } @if (list.displayMode === DisplayMode.SMALL_CARDS) {