mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-04-02 13:45:10 -05:00
Merge branch 'dev' into travis-multiarch-builds
This commit is contained in:
jonaswinkler
commit
9bf4ce25b2
@ -30,6 +30,7 @@ RUN apt-get update \
|
|||||||
&& apt-get -y --no-install-recommends install \
|
&& apt-get -y --no-install-recommends install \
|
||||||
build-essential \
|
build-essential \
|
||||||
curl \
|
curl \
|
||||||
|
fonts-liberation \
|
||||||
ghostscript \
|
ghostscript \
|
||||||
gnupg \
|
gnupg \
|
||||||
icc-profiles-free \
|
icc-profiles-free \
|
||||||
@ -93,6 +94,7 @@ RUN sudo -HEu paperless python3 manage.py collectstatic --clear --no-input
|
|||||||
|
|
||||||
VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
|
VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
|
||||||
ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
|
||||||
|
EXPOSE 8000
|
||||||
CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
|
CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
|
||||||
|
|
||||||
LABEL maintainer="Jonas Winkler <dev@jpwinkler.de>"
|
LABEL maintainer="Jonas Winkler <dev@jpwinkler.de>"
|
||||||
|
|||||||
25
README.md
25
README.md
@ -1,11 +1,12 @@
|
|||||||
[](https://travis-ci.org/jonaswinkler/paperless-ng)
|
[](https://travis-ci.org/jonaswinkler/paperless-ng)
|
||||||
[](https://paperless-ng.readthedocs.io/en/latest/?badge=latest)
|
[](https://paperless-ng.readthedocs.io/en/latest/?badge=latest)
|
||||||
|
[](https://gitter.im/paperless-ng/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||||
[](https://hub.docker.com/r/jonaswinkler/paperless-ng)
|
[](https://hub.docker.com/r/jonaswinkler/paperless-ng)
|
||||||
[](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master)
|
[](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master)
|
||||||
|
|
||||||
# Paperless-ng
|
# Paperless-ng
|
||||||
|
|
||||||
[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
|
[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
|
||||||
|
|
||||||
Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation.
|
Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation.
|
||||||
|
|
||||||
@ -39,14 +40,13 @@ Here's what you get:
|
|||||||
* Auto completion suggests relevant words from your documents.
|
* Auto completion suggests relevant words from your documents.
|
||||||
* Results are sorted by relevance to your search query.
|
* Results are sorted by relevance to your search query.
|
||||||
* Highlighting shows you which parts of the document matched the query.
|
* Highlighting shows you which parts of the document matched the query.
|
||||||
|
* Searching for similar documents ("More like this")
|
||||||
* Email processing: Paperless adds documents from your email accounts.
|
* Email processing: Paperless adds documents from your email accounts.
|
||||||
* Configure multiple accounts and filters for each account.
|
* Configure multiple accounts and filters for each account.
|
||||||
* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
|
* When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them.
|
||||||
* Machine learning powered document matching.
|
* Machine learning powered document matching.
|
||||||
* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
|
* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
|
||||||
* A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
|
* A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast.
|
||||||
* Code cleanup in many, MANY areas. Some of the code from OG paperless was just overly complicated.
|
|
||||||
* More tests, more stability.
|
|
||||||
|
|
||||||
If you want to see some screenshots of paperless-ng in action, [some are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html).
|
If you want to see some screenshots of paperless-ng in action, [some are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html).
|
||||||
|
|
||||||
@ -54,10 +54,7 @@ For a complete list of changes from paperless, check out the [changelog](https:/
|
|||||||
|
|
||||||
# Roadmap for 1.0
|
# Roadmap for 1.0
|
||||||
|
|
||||||
- **Bulk editing**. Add/remove metadata from multiple documents at once.
|
|
||||||
|
|
||||||
- Make the front end nice (except mobile).
|
- Make the front end nice (except mobile).
|
||||||
- Test coverage at 90%.
|
|
||||||
- Fix whatever bugs I and you find.
|
- Fix whatever bugs I and you find.
|
||||||
|
|
||||||
## Roadmap for versions beyond 1.0
|
## Roadmap for versions beyond 1.0
|
||||||
@ -66,13 +63,13 @@ These are things that I want to add to paperless eventually. They are sorted by
|
|||||||
|
|
||||||
- **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
|
- **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
|
||||||
- Group and limit search results by correspondent, show “more from this” links in the results.
|
- Group and limit search results by correspondent, show “more from this” links in the results.
|
||||||
- Ability to search for “Similar documents” in the search results
|
|
||||||
- **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
|
- **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system.
|
||||||
|
- **Localization.** I won't translate paperless into any other languages except English and German, however, I'll add the necessary means so that anyone can translate paperless into their favorite language.
|
||||||
- **An interactive consumer** that shows its progress for documents it processes on the web page.
|
- **An interactive consumer** that shows its progress for documents it processes on the web page.
|
||||||
- With live updates ans websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particular happy about.
|
- With live updates and websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particularly happy about.
|
||||||
- Notifications when a document was added with buttons to open the new document right away.
|
- Notifications when a document was added with buttons to open the new document right away.
|
||||||
- **Arbitrary tag colors**. Allow the selection of any color with a color picker.
|
- **Arbitrary tag colors**. Allow the selection of any color with a color picker.
|
||||||
- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc, .docx documents.
|
- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc and .docx documents.
|
||||||
|
|
||||||
Apart from that, paperless is pretty much feature complete.
|
Apart from that, paperless is pretty much feature complete.
|
||||||
|
|
||||||
@ -80,6 +77,15 @@ Apart from that, paperless is pretty much feature complete.
|
|||||||
|
|
||||||
- **GnuPG encrypion.** [Here's a note about encryption in paperless](https://paperless-ng.readthedocs.io/en/latest/administration.html#managing-encryption). The gist of it is that I don't see which attacks this implementation protects against. It gives a false sense of security to users who don't care about how it works.
|
- **GnuPG encrypion.** [Here's a note about encryption in paperless](https://paperless-ng.readthedocs.io/en/latest/administration.html#managing-encryption). The gist of it is that I don't see which attacks this implementation protects against. It gives a false sense of security to users who don't care about how it works.
|
||||||
|
|
||||||
|
## Wont-do list.
|
||||||
|
|
||||||
|
These features will probably never make it into paperless, since paperless is meant to be an easy to use set-and-forget solution.
|
||||||
|
|
||||||
|
- **Document versions.** I might consider adding the ability to update a document with a newer version, but that's about it. The kind of documents that get added to paperless usually don't change at all.
|
||||||
|
- **Workflows.** I don't see a use case for these, yet.
|
||||||
|
- **Folders.** Tags are superior in just about every way.
|
||||||
|
- **Apps / extension support.** Again, paperless is meant to be simple.
|
||||||
|
|
||||||
# Getting started
|
# Getting started
|
||||||
|
|
||||||
The recommended way to deploy paperless is docker-compose. Don't clone the repository, grab the latest release to get started instead. The dockerfiles archive contains just the docker files which will pull the image from docker hub. The source archive contains everything you need to build the docker image yourself (i.e. if you want to run on Raspberry Pi).
|
The recommended way to deploy paperless is docker-compose. Don't clone the repository, grab the latest release to get started instead. The dockerfiles archive contains just the docker files which will pull the image from docker hub. The source archive contains everything you need to build the docker image yourself (i.e. if you want to run on Raspberry Pi).
|
||||||
@ -116,7 +122,6 @@ Paperless has been around a while now, and people are starting to build stuff on
|
|||||||
These projects also exist, but their status and compatibility with paperless-ng is unknown.
|
These projects also exist, but their status and compatibility with paperless-ng is unknown.
|
||||||
|
|
||||||
* [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation. Runs on Mac, Linux, and Windows.
|
* [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation. Runs on Mac, Linux, and Windows.
|
||||||
* [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.
|
|
||||||
* [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.
|
* [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.
|
||||||
|
|
||||||
# Important Note
|
# Important Note
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
bind = '127.0.0.1:8000'
|
bind = '[::]:8000'
|
||||||
backlog = 2048
|
backlog = 2048
|
||||||
workers = 3
|
workers = 3
|
||||||
worker_class = 'sync'
|
worker_class = 'sync'
|
||||||
|
|||||||
@ -8,7 +8,7 @@ loglevel=info ; log level; default info; others: debug,warn,trace
|
|||||||
user=root
|
user=root
|
||||||
|
|
||||||
[program:gunicorn]
|
[program:gunicorn]
|
||||||
command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi
|
command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b '[::]:8000' paperless.wsgi
|
||||||
user=paperless
|
user=paperless
|
||||||
|
|
||||||
stdout_logfile=/dev/stdout
|
stdout_logfile=/dev/stdout
|
||||||
|
|||||||
@ -221,8 +221,9 @@ writing. Windows is not and will never be supported.
|
|||||||
* ``python3-pip``, optionally ``pipenv`` for package installation
|
* ``python3-pip``, optionally ``pipenv`` for package installation
|
||||||
* ``python3-dev``
|
* ``python3-dev``
|
||||||
|
|
||||||
|
* ``fonts-liberation`` for generating thumbnails for plain text files
|
||||||
* ``imagemagick`` >= 6 for PDF conversion
|
* ``imagemagick`` >= 6 for PDF conversion
|
||||||
* ``optipng`` for optimising thumbnails
|
* ``optipng`` for optimizing thumbnails
|
||||||
* ``gnupg`` for handling encrypted documents
|
* ``gnupg`` for handling encrypted documents
|
||||||
* ``libpoppler-cpp-dev`` for PDF to text conversion
|
* ``libpoppler-cpp-dev`` for PDF to text conversion
|
||||||
* ``libmagic-dev`` for mime type detection
|
* ``libmagic-dev`` for mime type detection
|
||||||
@ -242,8 +243,7 @@ writing. Windows is not and will never be supported.
|
|||||||
* ``tesseract-ocr`` language packs (``tesseract-ocr-eng``, ``tesseract-ocr-deu``, etc)
|
* ``tesseract-ocr`` language packs (``tesseract-ocr-eng``, ``tesseract-ocr-deu``, etc)
|
||||||
|
|
||||||
You will also need ``build-essential``, ``python3-setuptools`` and ``python3-wheel``
|
You will also need ``build-essential``, ``python3-setuptools`` and ``python3-wheel``
|
||||||
for installing some of the python dependencies. You can remove that
|
for installing some of the python dependencies.
|
||||||
again after installation.
|
|
||||||
|
|
||||||
2. Install ``redis`` >= 5.0 and configure it to start automatically.
|
2. Install ``redis`` >= 5.0 and configure it to start automatically.
|
||||||
|
|
||||||
|
|||||||
@ -31,7 +31,10 @@
|
|||||||
"styles": [
|
"styles": [
|
||||||
"src/styles.scss"
|
"src/styles.scss"
|
||||||
],
|
],
|
||||||
"scripts": []
|
"scripts": [],
|
||||||
|
"allowedCommonJsDependencies": [
|
||||||
|
"ng2-pdf-viewer"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
@ -127,4 +130,4 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"defaultProject": "paperless-ui"
|
"defaultProject": "paperless-ui"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,12 +26,13 @@ import { ResultHighlightComponent } from './components/search/result-highlight/r
|
|||||||
import { PageHeaderComponent } from './components/common/page-header/page-header.component';
|
import { PageHeaderComponent } from './components/common/page-header/page-header.component';
|
||||||
import { AppFrameComponent } from './components/app-frame/app-frame.component';
|
import { AppFrameComponent } from './components/app-frame/app-frame.component';
|
||||||
import { ToastsComponent } from './components/common/toasts/toasts.component';
|
import { ToastsComponent } from './components/common/toasts/toasts.component';
|
||||||
import { FilterEditorComponent } from './components/filter-editor/filter-editor.component';
|
import { FilterEditorComponent } from './components/document-list/filter-editor/filter-editor.component';
|
||||||
import { FilterDropdownComponent } from './components/filter-editor/filter-dropdown/filter-dropdown.component';
|
import { FilterableDropdownComponent } from './components/common/filterable-dropdown/filterable-dropdown.component';
|
||||||
import { FilterDropdownButtonComponent } from './components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component';
|
import { ToggleableDropdownButtonComponent } from './components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
|
||||||
import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown-date/filter-dropdown-date.component';
|
import { DateDropdownComponent } from './components/common/date-dropdown/date-dropdown.component';
|
||||||
import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
|
import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component';
|
||||||
import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
|
import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component';
|
||||||
|
import { BulkEditorComponent } from './components/document-list/bulk-editor/bulk-editor.component';
|
||||||
import { NgxFileDropModule } from 'ngx-file-drop';
|
import { NgxFileDropModule } from 'ngx-file-drop';
|
||||||
import { TextComponent } from './components/common/input/text/text.component';
|
import { TextComponent } from './components/common/input/text/text.component';
|
||||||
import { SelectComponent } from './components/common/input/select/select.component';
|
import { SelectComponent } from './components/common/input/select/select.component';
|
||||||
@ -54,8 +55,8 @@ import { FileSizePipe } from './pipes/file-size.pipe';
|
|||||||
import { FilterPipe } from './pipes/filter.pipe';
|
import { FilterPipe } from './pipes/filter.pipe';
|
||||||
import { DocumentTitlePipe } from './pipes/document-title.pipe';
|
import { DocumentTitlePipe } from './pipes/document-title.pipe';
|
||||||
import { MetadataCollapseComponent } from './components/document-detail/metadata-collapse/metadata-collapse.component';
|
import { MetadataCollapseComponent } from './components/document-detail/metadata-collapse/metadata-collapse.component';
|
||||||
import { NgSelectModule } from '@ng-select/ng-select';
|
|
||||||
import { SelectDialogComponent } from './components/common/select-dialog/select-dialog.component';
|
import { SelectDialogComponent } from './components/common/select-dialog/select-dialog.component';
|
||||||
|
import { NgSelectModule } from '@ng-select/ng-select';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [
|
declarations: [
|
||||||
@ -80,11 +81,12 @@ import { SelectDialogComponent } from './components/common/select-dialog/select-
|
|||||||
AppFrameComponent,
|
AppFrameComponent,
|
||||||
ToastsComponent,
|
ToastsComponent,
|
||||||
FilterEditorComponent,
|
FilterEditorComponent,
|
||||||
FilterDropdownComponent,
|
FilterableDropdownComponent,
|
||||||
FilterDropdownButtonComponent,
|
ToggleableDropdownButtonComponent,
|
||||||
FilterDropdownDateComponent,
|
DateDropdownComponent,
|
||||||
DocumentCardLargeComponent,
|
DocumentCardLargeComponent,
|
||||||
DocumentCardSmallComponent,
|
DocumentCardSmallComponent,
|
||||||
|
BulkEditorComponent,
|
||||||
TextComponent,
|
TextComponent,
|
||||||
SelectComponent,
|
SelectComponent,
|
||||||
CheckComponent,
|
CheckComponent,
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<nav class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow">
|
<nav class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow">
|
||||||
<span class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="#">
|
<a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" routerLink="/dashboard">
|
||||||
<img src="assets/logo-dark-notext.svg" height="18px" class="mr-2">
|
<img src="assets/logo-dark-notext.svg" height="18px" class="mr-2">
|
||||||
<ng-container i18n="app title">Paperless-ng</ng-container>
|
<ng-container i18n="app title">Paperless-ng</ng-container>
|
||||||
</span>
|
</a>
|
||||||
<button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
|
<button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
|
||||||
data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
|
data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
|
||||||
(click)="isMenuCollapsed = !isMenuCollapsed">
|
(click)="isMenuCollapsed = !isMenuCollapsed">
|
||||||
|
|||||||
@ -14,7 +14,7 @@ export class ConfirmDialogComponent implements OnInit {
|
|||||||
public confirmClicked = new EventEmitter()
|
public confirmClicked = new EventEmitter()
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
title = "Confirmation"
|
title = $localize`Confirmation`
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
messageBold
|
messageBold
|
||||||
@ -26,7 +26,7 @@ export class ConfirmDialogComponent implements OnInit {
|
|||||||
btnClass = "btn-primary"
|
btnClass = "btn-primary"
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
btnCaption = "Confirm"
|
btnCaption = $localize`Confirm`
|
||||||
|
|
||||||
confirmButtonEnabled = true
|
confirmButtonEnabled = true
|
||||||
seconds = 0
|
seconds = 0
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="dateBefore || dateAfter ? 'btn-primary' : 'btn-outline-primary'">
|
<button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="dateBefore || dateAfter ? 'btn-primary' : 'btn-outline-primary'">
|
||||||
{{title}}
|
{{title}}
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu date-filter shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
|
<div class="dropdown-menu date-dropdown shadow pt-0" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
|
||||||
<div class="list-group list-group-flush">
|
<div class="list-group list-group-flush">
|
||||||
<button *ngFor="let qf of quickFilters" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(qf.id)">
|
<button *ngFor="let qf of quickFilters" class="list-group-item small list-goup list-group-item-action d-flex p-2 pl-3" role="menuitem" (click)="setDateQuickFilter(qf.id)">
|
||||||
{{qf.name}}
|
{{qf.name}}
|
||||||
@ -10,12 +10,12 @@
|
|||||||
<div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
|
<div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
|
||||||
|
|
||||||
<div class="mb-2 d-flex flex-row w-100 justify-content-between small">
|
<div class="mb-2 d-flex flex-row w-100 justify-content-between small">
|
||||||
<div>After</div>
|
<div i18n>After</div>
|
||||||
<a *ngIf="dateAfter" class="btn btn-link p-0 m-0" (click)="clearAfter()">
|
<a *ngIf="dateAfter" class="btn btn-link p-0 m-0" (click)="clearAfter()">
|
||||||
<svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
<svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||||
<path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
|
<path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
|
||||||
</svg>
|
</svg>
|
||||||
<small>Clear</small>
|
<small i18n>Clear</small>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -26,12 +26,12 @@
|
|||||||
<div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
|
<div class="list-group-item d-flex flex-column align-items-start" role="menuitem">
|
||||||
|
|
||||||
<div class="mb-2 d-flex flex-row w-100 justify-content-between small">
|
<div class="mb-2 d-flex flex-row w-100 justify-content-between small">
|
||||||
<div>Before</div>
|
<div i18n>Before</div>
|
||||||
<a *ngIf="dateBefore" class="btn btn-link p-0 m-0" (click)="clearBefore()">
|
<a *ngIf="dateBefore" class="btn btn-link p-0 m-0" (click)="clearBefore()">
|
||||||
<svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
<svg width="0.8em" height="0.8em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||||
<path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
|
<path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
|
||||||
</svg>
|
</svg>
|
||||||
<small>Clear</small>
|
<small i18n>Clear</small>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
.date-filter {
|
.date-dropdown {
|
||||||
min-width: 250px;
|
min-width: 250px;
|
||||||
|
|
||||||
.btn-link {
|
.btn-link {
|
||||||
@ -1,20 +1,20 @@
|
|||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import { FilterDropodownComponent } from './filter-dropdown.component';
|
import { DateDropdownComponent } from './date-dropdown.component';
|
||||||
|
|
||||||
describe('FilterDropodownComponent', () => {
|
describe('DateDropdownComponent', () => {
|
||||||
let component: FilterDropodownComponent;
|
let component: DateDropdownComponent;
|
||||||
let fixture: ComponentFixture<FilterDropodownComponent>;
|
let fixture: ComponentFixture<DateDropdownComponent>;
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [ FilterDropodownComponent ]
|
declarations: [ DateDropdownComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(FilterDropodownComponent);
|
fixture = TestBed.createComponent(DateDropdownComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
@ -8,31 +8,37 @@ export interface DateSelection {
|
|||||||
after?: string
|
after?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
const FILTER_LAST_7_DAYS = 0
|
const LAST_7_DAYS = 0
|
||||||
const FILTER_LAST_MONTH = 1
|
const LAST_MONTH = 1
|
||||||
const FILTER_LAST_3_MONTHS = 2
|
const LAST_3_MONTHS = 2
|
||||||
const FILTER_LAST_YEAR = 3
|
const LAST_YEAR = 3
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-filter-dropdown-date',
|
selector: 'app-date-dropdown',
|
||||||
templateUrl: './filter-dropdown-date.component.html',
|
templateUrl: './date-dropdown.component.html',
|
||||||
styleUrls: ['./filter-dropdown-date.component.scss']
|
styleUrls: ['./date-dropdown.component.scss']
|
||||||
})
|
})
|
||||||
export class FilterDropdownDateComponent implements OnInit, OnDestroy {
|
export class DateDropdownComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
quickFilters = [
|
quickFilters = [
|
||||||
{id: FILTER_LAST_7_DAYS, name: "Last 7 days"},
|
{id: LAST_7_DAYS, name: "Last 7 days"},
|
||||||
{id: FILTER_LAST_MONTH, name: "Last month"},
|
{id: LAST_MONTH, name: "Last month"},
|
||||||
{id: FILTER_LAST_3_MONTHS, name: "Last 3 months"},
|
{id: LAST_3_MONTHS, name: "Last 3 months"},
|
||||||
{id: FILTER_LAST_YEAR, name: "Last year"}
|
{id: LAST_YEAR, name: "Last year"}
|
||||||
]
|
]
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
dateBefore: string
|
dateBefore: string
|
||||||
|
|
||||||
|
@Output()
|
||||||
|
dateBeforeChange = new EventEmitter<string>()
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
dateAfter: string
|
dateAfter: string
|
||||||
|
|
||||||
|
@Output()
|
||||||
|
dateAfterChange = new EventEmitter<string>()
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
title: string
|
title: string
|
||||||
|
|
||||||
@ -42,7 +48,7 @@ export class FilterDropdownDateComponent implements OnInit, OnDestroy {
|
|||||||
private datesSetDebounce$ = new Subject()
|
private datesSetDebounce$ = new Subject()
|
||||||
|
|
||||||
private sub: Subscription
|
private sub: Subscription
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.sub = this.datesSetDebounce$.pipe(
|
this.sub = this.datesSetDebounce$.pipe(
|
||||||
debounceTime(400)
|
debounceTime(400)
|
||||||
@ -61,28 +67,30 @@ export class FilterDropdownDateComponent implements OnInit, OnDestroy {
|
|||||||
this.dateBefore = null
|
this.dateBefore = null
|
||||||
let date = new Date()
|
let date = new Date()
|
||||||
switch (qf) {
|
switch (qf) {
|
||||||
case FILTER_LAST_7_DAYS:
|
case LAST_7_DAYS:
|
||||||
date.setDate(date.getDate() - 7)
|
date.setDate(date.getDate() - 7)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FILTER_LAST_MONTH:
|
case LAST_MONTH:
|
||||||
date.setMonth(date.getMonth() - 1)
|
date.setMonth(date.getMonth() - 1)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FILTER_LAST_3_MONTHS:
|
case LAST_3_MONTHS:
|
||||||
date.setMonth(date.getMonth() - 3)
|
date.setMonth(date.getMonth() - 3)
|
||||||
break
|
break
|
||||||
|
|
||||||
case FILTER_LAST_YEAR:
|
case LAST_YEAR:
|
||||||
date.setFullYear(date.getFullYear() - 1)
|
date.setFullYear(date.getFullYear() - 1)
|
||||||
break
|
break
|
||||||
|
|
||||||
}
|
}
|
||||||
this.dateAfter = formatDate(date, 'yyyy-MM-dd', "en-us", "UTC")
|
this.dateAfter = formatDate(date, 'yyyy-MM-dd', "en-us", "UTC")
|
||||||
this.onChange()
|
this.onChange()
|
||||||
}
|
}
|
||||||
|
|
||||||
onChange() {
|
onChange() {
|
||||||
|
this.dateAfterChange.emit(this.dateAfter)
|
||||||
|
this.dateBeforeChange.emit(this.dateBefore)
|
||||||
this.datesSet.emit({after: this.dateAfter, before: this.dateBefore})
|
this.datesSet.emit({after: this.dateAfter, before: this.dateBefore})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -91,12 +99,12 @@ export class FilterDropdownDateComponent implements OnInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
clearBefore() {
|
clearBefore() {
|
||||||
this.dateBefore = null;
|
this.dateBefore = null
|
||||||
this.onChange()
|
this.onChange()
|
||||||
}
|
}
|
||||||
|
|
||||||
clearAfter() {
|
clearAfter() {
|
||||||
this.dateAfter = null;
|
this.dateAfter = null
|
||||||
this.onChange()
|
this.onChange()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
<div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
|
||||||
|
<button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
|
||||||
|
<div class="d-none d-md-inline">{{title}}</div>
|
||||||
|
<div class="d-inline-block d-md-none">
|
||||||
|
<svg class="toolbaricon" fill="currentColor">
|
||||||
|
<use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<ng-container *ngIf="!editing && selectionModel.selectionSize() > 0">
|
||||||
|
<div class="badge bg-secondary text-light rounded-pill badge-corner">
|
||||||
|
{{selectionModel.selectionSize()}}
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
|
</button>
|
||||||
|
<div class="dropdown-menu py-0 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
|
||||||
|
<div class="list-group list-group-flush">
|
||||||
|
<div class="list-group-item">
|
||||||
|
<div class="input-group input-group-sm">
|
||||||
|
<input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div *ngIf="selectionModel.items" class="items">
|
||||||
|
<ng-container *ngFor="let item of selectionModel.items | filter: filterText">
|
||||||
|
<app-toggleable-dropdown-button *ngIf="allowSelectNone || item.id" [item]="item" [state]="selectionModel.get(item.id)" (toggle)="selectionModel.toggle(item.id)"></app-toggleable-dropdown-button>
|
||||||
|
</ng-container>
|
||||||
|
</div>
|
||||||
|
<button *ngIf="editing" class="list-group-item list-group-item-action bg-light" (click)="applyClicked()" [disabled]="!selectionModel.isDirty()">
|
||||||
|
<small class="ml-1" [ngClass]="{'font-weight-bold': selectionModel.isDirty()}" i18n>Apply</small>
|
||||||
|
<svg width="1.5em" height="1em" viewBox="0 0 16 16" fill="currentColor">
|
||||||
|
<use xlink:href="assets/bootstrap-icons.svg#arrow-right" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { FilterableDropodownComponent } from './filterable-dropdown.component';
|
||||||
|
|
||||||
|
describe('FilterableDropodownComponent', () => {
|
||||||
|
let component: FilterableDropodownComponent;
|
||||||
|
let fixture: ComponentFixture<FilterableDropodownComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ FilterableDropodownComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(FilterableDropodownComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@ -0,0 +1,240 @@
|
|||||||
|
import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
|
||||||
|
import { FilterPipe } from 'src/app/pipes/filter.pipe';
|
||||||
|
import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
|
||||||
|
import { ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component';
|
||||||
|
import { MatchingModel } from 'src/app/data/matching-model';
|
||||||
|
import { Subject } from 'rxjs';
|
||||||
|
|
||||||
|
export interface ChangedItems {
|
||||||
|
itemsToAdd: MatchingModel[],
|
||||||
|
itemsToRemove: MatchingModel[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export class FilterableDropdownSelectionModel {
|
||||||
|
|
||||||
|
changed = new Subject<FilterableDropdownSelectionModel>()
|
||||||
|
|
||||||
|
multiple = false
|
||||||
|
|
||||||
|
items: MatchingModel[] = []
|
||||||
|
|
||||||
|
private selectionStates = new Map<number, ToggleableItemState>()
|
||||||
|
|
||||||
|
private temporarySelectionStates = new Map<number, ToggleableItemState>()
|
||||||
|
|
||||||
|
getSelectedItems() {
|
||||||
|
return this.items.filter(i => this.temporarySelectionStates.get(i.id) == ToggleableItemState.Selected)
|
||||||
|
}
|
||||||
|
|
||||||
|
set(id: number, state: ToggleableItemState, fireEvent = true) {
|
||||||
|
if (state == ToggleableItemState.NotSelected) {
|
||||||
|
this.temporarySelectionStates.delete(id)
|
||||||
|
} else {
|
||||||
|
this.temporarySelectionStates.set(id, state)
|
||||||
|
}
|
||||||
|
if (fireEvent) {
|
||||||
|
this.changed.next(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
toggle(id: number, fireEvent = true) {
|
||||||
|
let state = this.temporarySelectionStates.get(id)
|
||||||
|
if (state == null || state != ToggleableItemState.Selected) {
|
||||||
|
this.temporarySelectionStates.set(id, ToggleableItemState.Selected)
|
||||||
|
} else if (state == ToggleableItemState.Selected) {
|
||||||
|
this.temporarySelectionStates.delete(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.multiple) {
|
||||||
|
for (let key of this.temporarySelectionStates.keys()) {
|
||||||
|
if (key != id) {
|
||||||
|
this.temporarySelectionStates.delete(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!id) {
|
||||||
|
for (let key of this.temporarySelectionStates.keys()) {
|
||||||
|
if (key) {
|
||||||
|
this.temporarySelectionStates.delete(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.temporarySelectionStates.delete(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fireEvent) {
|
||||||
|
this.changed.next(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
get(id: number) {
|
||||||
|
return this.temporarySelectionStates.get(id) || ToggleableItemState.NotSelected
|
||||||
|
}
|
||||||
|
|
||||||
|
selectionSize() {
|
||||||
|
return this.getSelectedItems().length
|
||||||
|
}
|
||||||
|
|
||||||
|
clear(fireEvent = true) {
|
||||||
|
this.temporarySelectionStates.clear()
|
||||||
|
if (fireEvent) {
|
||||||
|
this.changed.next(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
isDirty() {
|
||||||
|
if (!Array.from(this.temporarySelectionStates.keys()).every(id => this.temporarySelectionStates.get(id) == this.selectionStates.get(id))) {
|
||||||
|
return true
|
||||||
|
} else if (!Array.from(this.selectionStates.keys()).every(id => this.selectionStates.get(id) == this.temporarySelectionStates.get(id))) {
|
||||||
|
return true
|
||||||
|
} else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
isNoneSelected() {
|
||||||
|
return this.selectionSize() == 1 && this.get(null) == ToggleableItemState.Selected
|
||||||
|
}
|
||||||
|
|
||||||
|
init(map) {
|
||||||
|
this.temporarySelectionStates = map
|
||||||
|
this.apply()
|
||||||
|
}
|
||||||
|
|
||||||
|
apply() {
|
||||||
|
this.selectionStates.clear()
|
||||||
|
this.temporarySelectionStates.forEach((value, key) => {
|
||||||
|
this.selectionStates.set(key, value)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
reset() {
|
||||||
|
this.temporarySelectionStates.clear()
|
||||||
|
this.selectionStates.forEach((value, key) => {
|
||||||
|
this.temporarySelectionStates.set(key, value)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
diff(): ChangedItems {
|
||||||
|
return {
|
||||||
|
itemsToAdd: this.items.filter(item => this.temporarySelectionStates.get(item.id) == ToggleableItemState.Selected && this.selectionStates.get(item.id) != ToggleableItemState.Selected),
|
||||||
|
itemsToRemove: this.items.filter(item => !this.temporarySelectionStates.has(item.id) && this.selectionStates.has(item.id)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-filterable-dropdown',
|
||||||
|
templateUrl: './filterable-dropdown.component.html',
|
||||||
|
styleUrls: ['./filterable-dropdown.component.scss']
|
||||||
|
})
|
||||||
|
export class FilterableDropdownComponent {
|
||||||
|
|
||||||
|
@ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
|
||||||
|
@ViewChild('dropdown') dropdown: NgbDropdown
|
||||||
|
|
||||||
|
filterText: string
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
set items(items: MatchingModel[]) {
|
||||||
|
if (items) {
|
||||||
|
this._selectionModel.items = Array.from(items)
|
||||||
|
this._selectionModel.items.unshift({
|
||||||
|
name: "None",
|
||||||
|
id: null
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
get items(): MatchingModel[] {
|
||||||
|
return this._selectionModel.items
|
||||||
|
}
|
||||||
|
|
||||||
|
_selectionModel = new FilterableDropdownSelectionModel()
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
set selectionModel(model: FilterableDropdownSelectionModel) {
|
||||||
|
if (this.selectionModel) {
|
||||||
|
this.selectionModel.changed.complete()
|
||||||
|
model.items = this.selectionModel.items
|
||||||
|
model.multiple = this.selectionModel.multiple
|
||||||
|
}
|
||||||
|
model.changed.subscribe(updatedModel => {
|
||||||
|
this.selectionModelChange.next(updatedModel)
|
||||||
|
})
|
||||||
|
this._selectionModel = model
|
||||||
|
}
|
||||||
|
|
||||||
|
get selectionModel(): FilterableDropdownSelectionModel {
|
||||||
|
return this._selectionModel
|
||||||
|
}
|
||||||
|
|
||||||
|
@Output()
|
||||||
|
selectionModelChange = new EventEmitter<FilterableDropdownSelectionModel>()
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
set multiple(value: boolean) {
|
||||||
|
this.selectionModel.multiple = value
|
||||||
|
}
|
||||||
|
|
||||||
|
get multiple() {
|
||||||
|
return this.selectionModel.multiple
|
||||||
|
}
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
title: string
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
icon: string
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
allowSelectNone: boolean = false
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
editing = false
|
||||||
|
|
||||||
|
@Output()
|
||||||
|
apply = new EventEmitter<ChangedItems>()
|
||||||
|
|
||||||
|
@Output()
|
||||||
|
open = new EventEmitter()
|
||||||
|
|
||||||
|
constructor(private filterPipe: FilterPipe) {
|
||||||
|
this.selectionModel = new FilterableDropdownSelectionModel()
|
||||||
|
}
|
||||||
|
|
||||||
|
applyClicked() {
|
||||||
|
if (this.selectionModel.isDirty()) {
|
||||||
|
this.dropdown.close()
|
||||||
|
this.apply.emit(this.selectionModel.diff())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dropdownOpenChange(open: boolean): void {
|
||||||
|
if (open) {
|
||||||
|
setTimeout(() => {
|
||||||
|
this.listFilterTextInput.nativeElement.focus();
|
||||||
|
}, 0)
|
||||||
|
if (this.editing) {
|
||||||
|
this.selectionModel.reset()
|
||||||
|
}
|
||||||
|
this.open.next()
|
||||||
|
} else {
|
||||||
|
this.filterText = ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
listFilterEnter(): void {
|
||||||
|
let filtered = this.filterPipe.transform(this.items, this.filterText)
|
||||||
|
if (filtered.length == 1) {
|
||||||
|
this.selectionModel.toggle(filtered[0].id)
|
||||||
|
if (this.editing) {
|
||||||
|
this.applyClicked()
|
||||||
|
} else {
|
||||||
|
this.dropdown.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
<button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-left-0 border-right-0 border-bottom" role="menuitem" (click)="toggleItem()">
|
||||||
|
<div class="selected-icon mr-1">
|
||||||
|
<ng-container *ngIf="isChecked()">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" class="bi bi-check" viewBox="0 0 16 16">
|
||||||
|
<path d="M10.97 4.97a.75.75 0 0 1 1.07 1.05l-3.99 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.267.267 0 0 1 .02-.022z"/>
|
||||||
|
</svg>
|
||||||
|
</ng-container>
|
||||||
|
<ng-container *ngIf="isPartiallyChecked()">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" class="bi bi-dash" viewBox="0 0 16 16">
|
||||||
|
<path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8z"/>
|
||||||
|
</svg>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="mr-1">
|
||||||
|
<app-tag *ngIf="isTag; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
|
||||||
|
<ng-template #displayName><small>{{item.name}}</small></ng-template>
|
||||||
|
</div>
|
||||||
|
<div class="badge badge-light rounded-pill ml-auto mr-1">{{item.document_count}}</div>
|
||||||
|
</button>
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ToggleableDropdownButtonComponent } from './toggleable-dropdown-button.component';
|
||||||
|
|
||||||
|
describe('ToggleableDropdownButtonComponent', () => {
|
||||||
|
let component: ToggleableDropdownButtonComponent;
|
||||||
|
let fixture: ComponentFixture<ToggleableDropdownButtonComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ ToggleableDropdownButtonComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ToggleableDropdownButtonComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@ -0,0 +1,51 @@
|
|||||||
|
import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
|
||||||
|
import { MatchingModel } from 'src/app/data/matching-model';
|
||||||
|
|
||||||
|
export interface ToggleableItem {
|
||||||
|
item: MatchingModel,
|
||||||
|
state: ToggleableItemState,
|
||||||
|
count: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum ToggleableItemState {
|
||||||
|
NotSelected = 0,
|
||||||
|
Selected = 1,
|
||||||
|
PartiallySelected = 2
|
||||||
|
}
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-toggleable-dropdown-button',
|
||||||
|
templateUrl: './toggleable-dropdown-button.component.html',
|
||||||
|
styleUrls: ['./toggleable-dropdown-button.component.scss']
|
||||||
|
})
|
||||||
|
export class ToggleableDropdownButtonComponent {
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
item: MatchingModel
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
state: ToggleableItemState
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
count: number
|
||||||
|
|
||||||
|
@Output()
|
||||||
|
toggle = new EventEmitter()
|
||||||
|
|
||||||
|
get isTag(): boolean {
|
||||||
|
return 'is_inbox_tag' in this.item
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleItem(): void {
|
||||||
|
this.toggle.emit()
|
||||||
|
}
|
||||||
|
|
||||||
|
isChecked() {
|
||||||
|
return this.state == ToggleableItemState.Selected
|
||||||
|
}
|
||||||
|
|
||||||
|
isPartiallyChecked() {
|
||||||
|
return this.state == ToggleableItemState.PartiallySelected
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -10,6 +10,6 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="button" class="btn btn-outline-dark" (click)="cancelClicked()">Cancel</button>
|
<button type="button" class="btn btn-outline-dark" (click)="cancelClicked()" i18n>Cancel</button>
|
||||||
<button type="button" class="btn btn-primary" (click)="selectClicked.emit(selected)">Select</button>
|
<button type="button" class="btn btn-primary" (click)="selectClicked.emit(selected)" i18n>Select</button>
|
||||||
</div>
|
</div>
|
||||||
@ -15,10 +15,10 @@ export class SelectDialogComponent implements OnInit {
|
|||||||
public selectClicked = new EventEmitter()
|
public selectClicked = new EventEmitter()
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
title = "Select"
|
title = $localize`Select`
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
message = "Please select an object"
|
message = $localize`Please select an object`
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
objects: ObjectWithId[] = []
|
objects: ObjectWithId[] = []
|
||||||
|
|||||||
@ -24,7 +24,7 @@ export class DashboardComponent implements OnInit {
|
|||||||
} else if (tagUsername && tagUsername.content) {
|
} else if (tagUsername && tagUsername.content) {
|
||||||
return tagUsername.content
|
return tagUsername.content
|
||||||
} else {
|
} else {
|
||||||
return "null"
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -58,7 +58,7 @@
|
|||||||
|
|
||||||
<app-input-text i18n-title title="Title" formControlName="title"></app-input-text>
|
<app-input-text i18n-title title="Title" formControlName="title"></app-input-text>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="archive_serial_number" i18n>Archive Serial Number</label>
|
<label for="archive_serial_number" i18n>Archive serial number</label>
|
||||||
<input type="number" class="form-control" id="archive_serial_number"
|
<input type="number" class="form-control" id="archive_serial_number"
|
||||||
formControlName='archive_serial_number'>
|
formControlName='archive_serial_number'>
|
||||||
</div>
|
</div>
|
||||||
@ -139,7 +139,7 @@
|
|||||||
|
|
||||||
<div class="col-md-6 col-xl-8 mb-3">
|
<div class="col-md-6 col-xl-8 mb-3">
|
||||||
<div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'">
|
<div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'">
|
||||||
<pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
|
<pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [(page)]="previewCurrentPage" [render-text-mode]="2" (after-load-complete)="pdfPreviewLoaded($event)"></pdf-viewer>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -15,7 +15,7 @@ export class MetadataCollapseComponent implements OnInit {
|
|||||||
metadata
|
metadata
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
title = "Metadata"
|
title = $localize`Metadata`
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,61 @@
|
|||||||
|
<div class="row">
|
||||||
|
<div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
|
||||||
|
<button class="btn btn-sm btn-outline-danger" (click)="list.selectNone()">
|
||||||
|
<svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
|
||||||
|
<use xlink:href="assets/bootstrap-icons.svg#slash-circle" />
|
||||||
|
</svg> <ng-container i18n>Cancel</ng-container>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="w-100 d-xl-none"></div>
|
||||||
|
<div class="col-auto mb-2 mb-xl-0" role="group" aria-label="Select">
|
||||||
|
<label class="mr-2 mb-0" i18n>Select:</label>
|
||||||
|
<div class="btn-group">
|
||||||
|
<button class="btn btn-sm btn-outline-primary" (click)="list.selectPage()">
|
||||||
|
<svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
|
||||||
|
<use xlink:href="assets/bootstrap-icons.svg#file-earmark-check" />
|
||||||
|
</svg> <ng-container i18n>Page</ng-container>
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-sm btn-outline-primary" (click)="list.selectAll()">
|
||||||
|
<svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
|
||||||
|
<use xlink:href="assets/bootstrap-icons.svg#check-all" />
|
||||||
|
</svg> <ng-container i18n>All</ng-container>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="w-100 d-xl-none"></div>
|
||||||
|
<div class="col-auto mb-2 mb-xl-0">
|
||||||
|
<div class="d-flex">
|
||||||
|
<label class="ml-auto mt-1 mb-0 mr-2" i18n>Edit:</label>
|
||||||
|
<app-filterable-dropdown class="mr-2 mr-md-3" title="Tags" icon="tag-fill"
|
||||||
|
[items]="tags"
|
||||||
|
[editing]="true"
|
||||||
|
[multiple]="true"
|
||||||
|
(open)="openTagsDropdown()"
|
||||||
|
[(selectionModel)]="tagSelectionModel"
|
||||||
|
(apply)="setTags($event)">
|
||||||
|
</app-filterable-dropdown>
|
||||||
|
<app-filterable-dropdown class="mr-2 mr-md-3" title="Correspondent" icon="person-fill"
|
||||||
|
[items]="correspondents"
|
||||||
|
[editing]="true"
|
||||||
|
(open)="openCorrespondentDropdown()"
|
||||||
|
[(selectionModel)]="correspondentSelectionModel"
|
||||||
|
(apply)="setCorrespondents($event)">
|
||||||
|
</app-filterable-dropdown>
|
||||||
|
<app-filterable-dropdown class="mr-2 mr-md-3" title="Document Type" icon="file-earmark-fill"
|
||||||
|
[items]="documentTypes"
|
||||||
|
[editing]="true"
|
||||||
|
(open)="openDocumentTypeDropdown()"
|
||||||
|
[(selectionModel)]="documentTypeSelectionModel"
|
||||||
|
(apply)="setDocumentTypes($event)">
|
||||||
|
</app-filterable-dropdown>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="w-100 d-xl-none"></div>
|
||||||
|
<div class="col mb-2 mb-xl-0 d-flex">
|
||||||
|
<button type="button" class="btn btn-sm btn-outline-danger ml-0 ml-lg-auto" (click)="applyDelete()">
|
||||||
|
<svg width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor">
|
||||||
|
<use xlink:href="assets/bootstrap-icons.svg#trash" />
|
||||||
|
</svg> <ng-container i18n>Delete</ng-container>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@ -1,20 +1,20 @@
|
|||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import { FilterDropdownDateComponent } from './filter-dropdown-date.component';
|
import { BulkEditorComponent } from './bulk-editor.component';
|
||||||
|
|
||||||
describe('FilterDropdownDateComponent', () => {
|
describe('BulkEditorComponent', () => {
|
||||||
let component: FilterDropdownDateComponent;
|
let component: BulkEditorComponent;
|
||||||
let fixture: ComponentFixture<FilterDropdownDateComponent>;
|
let fixture: ComponentFixture<BulkEditorComponent>;
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [ FilterDropdownDateComponent ]
|
declarations: [ BulkEditorComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(FilterDropdownDateComponent);
|
fixture = TestBed.createComponent(BulkEditorComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
@ -0,0 +1,174 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { tap } from 'rxjs/operators';
|
||||||
|
import { PaperlessTag } from 'src/app/data/paperless-tag';
|
||||||
|
import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
|
||||||
|
import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
|
||||||
|
import { TagService } from 'src/app/services/rest/tag.service';
|
||||||
|
import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
|
||||||
|
import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
|
||||||
|
import { DocumentListViewService } from 'src/app/services/document-list-view.service';
|
||||||
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
import { DocumentService, SelectionDataItem } from 'src/app/services/rest/document.service';
|
||||||
|
import { OpenDocumentsService } from 'src/app/services/open-documents.service';
|
||||||
|
import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component';
|
||||||
|
import { ChangedItems, FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
|
||||||
|
import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-bulk-editor',
|
||||||
|
templateUrl: './bulk-editor.component.html',
|
||||||
|
styleUrls: ['./bulk-editor.component.scss']
|
||||||
|
})
|
||||||
|
export class BulkEditorComponent {
|
||||||
|
|
||||||
|
tags: PaperlessTag[]
|
||||||
|
correspondents: PaperlessCorrespondent[]
|
||||||
|
documentTypes: PaperlessDocumentType[]
|
||||||
|
|
||||||
|
tagSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
|
correspondentSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
|
documentTypeSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private documentTypeService: DocumentTypeService,
|
||||||
|
private tagService: TagService,
|
||||||
|
private correspondentService: CorrespondentService,
|
||||||
|
public list: DocumentListViewService,
|
||||||
|
private documentService: DocumentService,
|
||||||
|
private modalService: NgbModal,
|
||||||
|
private openDocumentService: OpenDocumentsService
|
||||||
|
) { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.tagService.listAll().subscribe(result => this.tags = result.results)
|
||||||
|
this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
|
||||||
|
this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
|
||||||
|
}
|
||||||
|
|
||||||
|
private executeBulkOperation(method: string, args): Observable<any> {
|
||||||
|
return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
|
||||||
|
tap(() => {
|
||||||
|
this.list.reload()
|
||||||
|
this.list.selected.forEach(id => {
|
||||||
|
this.openDocumentService.refreshDocument(id)
|
||||||
|
})
|
||||||
|
this.list.selectNone()
|
||||||
|
})
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private applySelectionData(items: SelectionDataItem[], selectionModel: FilterableDropdownSelectionModel) {
|
||||||
|
let selectionData = new Map<number, ToggleableItemState>()
|
||||||
|
items.forEach(i => {
|
||||||
|
if (i.document_count == this.list.selected.size) {
|
||||||
|
selectionData.set(i.id, ToggleableItemState.Selected)
|
||||||
|
} else if (i.document_count > 0) {
|
||||||
|
selectionData.set(i.id, ToggleableItemState.PartiallySelected)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
selectionModel.init(selectionData)
|
||||||
|
}
|
||||||
|
|
||||||
|
openTagsDropdown() {
|
||||||
|
this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => {
|
||||||
|
this.applySelectionData(s.selected_tags, this.tagSelectionModel)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
openDocumentTypeDropdown() {
|
||||||
|
this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => {
|
||||||
|
this.applySelectionData(s.selected_document_types, this.documentTypeSelectionModel)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
openCorrespondentDropdown() {
|
||||||
|
this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => {
|
||||||
|
this.applySelectionData(s.selected_correspondents, this.correspondentSelectionModel)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
setTags(changedTags: ChangedItems) {
|
||||||
|
if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return
|
||||||
|
|
||||||
|
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
|
||||||
|
modal.componentInstance.title = "Confirm Tags Assignment"
|
||||||
|
|
||||||
|
modal.componentInstance.message = `This operation will modify some tags on all ${this.list.selected.size} selected document(s).`
|
||||||
|
modal.componentInstance.btnClass = "btn-warning"
|
||||||
|
modal.componentInstance.btnCaption = "Confirm"
|
||||||
|
modal.componentInstance.confirmClicked.subscribe(() => {
|
||||||
|
this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
|
||||||
|
response => {
|
||||||
|
this.tagService.clearCache()
|
||||||
|
modal.close()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
setCorrespondents(changedCorrespondents: ChangedItems) {
|
||||||
|
if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return
|
||||||
|
|
||||||
|
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
|
||||||
|
modal.componentInstance.title = "Confirm Correspondent Assignment"
|
||||||
|
let correspondent
|
||||||
|
let messageFragment = 'remove all correspondents from'
|
||||||
|
if (changedCorrespondents && changedCorrespondents.itemsToAdd.length > 0) {
|
||||||
|
correspondent = changedCorrespondents.itemsToAdd[0]
|
||||||
|
messageFragment = `assign the correspondent ${correspondent.name} to`
|
||||||
|
}
|
||||||
|
modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
|
||||||
|
modal.componentInstance.btnClass = "btn-warning"
|
||||||
|
modal.componentInstance.btnCaption = "Confirm"
|
||||||
|
modal.componentInstance.confirmClicked.subscribe(() => {
|
||||||
|
this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
|
||||||
|
response => {
|
||||||
|
this.correspondentService.clearCache()
|
||||||
|
modal.close()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
setDocumentTypes(changedDocumentTypes: ChangedItems) {
|
||||||
|
if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return
|
||||||
|
|
||||||
|
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
|
||||||
|
modal.componentInstance.title = "Confirm Document Type Assignment"
|
||||||
|
let documentType
|
||||||
|
let messageFragment = 'remove all document types from'
|
||||||
|
if (changedDocumentTypes && changedDocumentTypes.itemsToAdd.length > 0) {
|
||||||
|
documentType = changedDocumentTypes.itemsToAdd[0]
|
||||||
|
messageFragment = `assign the document type ${documentType.name} to`
|
||||||
|
}
|
||||||
|
modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).`
|
||||||
|
modal.componentInstance.btnClass = "btn-warning"
|
||||||
|
modal.componentInstance.btnCaption = "Confirm"
|
||||||
|
modal.componentInstance.confirmClicked.subscribe(() => {
|
||||||
|
this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
|
||||||
|
response => {
|
||||||
|
this.documentService.clearCache()
|
||||||
|
modal.close()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
applyDelete() {
|
||||||
|
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
|
||||||
|
modal.componentInstance.delayConfirm(5)
|
||||||
|
modal.componentInstance.title = "Delete confirm"
|
||||||
|
modal.componentInstance.messageBold = `This operation will permanently delete all ${this.list.selected.size} selected document(s).`
|
||||||
|
modal.componentInstance.message = `This operation cannot be undone.`
|
||||||
|
modal.componentInstance.btnClass = "btn-danger"
|
||||||
|
modal.componentInstance.btnCaption = "Delete document(s)"
|
||||||
|
modal.componentInstance.confirmClicked.subscribe(() => {
|
||||||
|
this.executeBulkOperation("delete", {}).subscribe(
|
||||||
|
response => {
|
||||||
|
modal.close()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,11 +1,11 @@
|
|||||||
<div class="card mb-3 bg-light shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable">
|
<div class="card mb-3 bg-light shadow-sm" [class.card-selected]="selected" [class.document-card]="selectable">
|
||||||
<div class="row no-gutters">
|
<div class="row no-gutters">
|
||||||
<div class="col-md-2 d-none d-lg-block doc-img-background" [class.doc-img-background-selected]="selected">
|
<div class="col-md-2 d-none d-lg-block doc-img-background" [class.doc-img-background-selected]="selected">
|
||||||
<img [src]="getThumbUrl()" class="card-img doc-img border-right" (click)="selected = selectable ? !selected : false">
|
<img [src]="getThumbUrl()" class="card-img doc-img border-right" (click)="setSelected(selectable ? !selected : false)">
|
||||||
|
|
||||||
<div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
|
<div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
|
||||||
<div class="custom-control custom-checkbox">
|
<div class="custom-control custom-checkbox">
|
||||||
<input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="selected = $event.target.checked">
|
<input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="setSelected($event.target.checked)">
|
||||||
<label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
|
<label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -12,15 +12,11 @@ export class DocumentCardLargeComponent implements OnInit {
|
|||||||
|
|
||||||
constructor(private documentService: DocumentService, private sanitizer: DomSanitizer) { }
|
constructor(private documentService: DocumentService, private sanitizer: DomSanitizer) { }
|
||||||
|
|
||||||
_selected = false
|
|
||||||
|
|
||||||
get selected() {
|
|
||||||
return this._selected
|
|
||||||
}
|
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
set selected(value: boolean) {
|
selected = false
|
||||||
this._selected = value
|
|
||||||
|
setSelected(value: boolean) {
|
||||||
|
this.selected = value
|
||||||
this.selectedChange.emit(value)
|
this.selectedChange.emit(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
<div class="col p-2 h-100 document-card">
|
<div class="col p-2 h-100">
|
||||||
<div class="card h-100 shadow-sm" [class.card-selected]="selected">
|
<div class="card h-100 shadow-sm" [class.card-selected]="selected">
|
||||||
<div class="border-bottom" [class.doc-img-background-selected]="selected">
|
<div class="border-bottom" [class.doc-img-background-selected]="selected">
|
||||||
<img class="card-img doc-img" [src]="getThumbUrl()" (click)="selected = !selected">
|
<img class="card-img doc-img" [src]="getThumbUrl()" (click)="setSelected(!selected)">
|
||||||
|
|
||||||
<div style="top: 0; left: 0" class="position-absolute border-right border-bottom bg-light p-1" [class.document-card-check]="!selected">
|
<div class="border-right border-bottom bg-light p-1 rounded document-card-check">
|
||||||
<div class="custom-control custom-checkbox">
|
<div class="custom-control custom-checkbox">
|
||||||
<input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="selected = $event.target.checked">
|
<input type="checkbox" class="custom-control-input" id="smallCardCheck{{document.id}}" [checked]="selected" (change)="setSelected($event.target.checked)">
|
||||||
<label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
|
<label class="custom-control-label" for="smallCardCheck{{document.id}}"></label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -8,7 +8,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.document-card-check {
|
.document-card-check {
|
||||||
display: none
|
display: none;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
|
||||||
|
.custom-control {
|
||||||
|
margin-left: 4px;
|
||||||
|
margin-right: -3px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.document-card:hover .document-card-check {
|
.document-card:hover .document-card-check {
|
||||||
@ -17,8 +25,12 @@
|
|||||||
|
|
||||||
.card-selected {
|
.card-selected {
|
||||||
border-color: $primary;
|
border-color: $primary;
|
||||||
|
|
||||||
|
.document-card-check {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.doc-img-background-selected {
|
.doc-img-background-selected {
|
||||||
background-color: $primaryFaded;
|
background-color: $primaryFaded;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,15 +12,11 @@ export class DocumentCardSmallComponent implements OnInit {
|
|||||||
|
|
||||||
constructor(private documentService: DocumentService) { }
|
constructor(private documentService: DocumentService) { }
|
||||||
|
|
||||||
_selected = false
|
|
||||||
|
|
||||||
get selected() {
|
|
||||||
return this._selected
|
|
||||||
}
|
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
set selected(value: boolean) {
|
selected = false
|
||||||
this._selected = value
|
|
||||||
|
setSelected(value: boolean) {
|
||||||
|
this.selected = value
|
||||||
this.selectedChange.emit(value)
|
this.selectedChange.emit(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,25 +1,16 @@
|
|||||||
<app-page-header [title]="getTitle()">
|
<app-page-header [title]="getTitle()">
|
||||||
|
|
||||||
<div ngbDropdown class="d-inline-block mr-2">
|
<div ngbDropdown class="d-inline-block mr-2">
|
||||||
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" ngbDropdownToggle>
|
<button class="btn btn-sm btn-outline-primary" id="dropdownSelect" ngbDropdownToggle>
|
||||||
<svg class="toolbaricon" fill="currentColor">
|
<svg class="toolbaricon" fill="currentColor">
|
||||||
<use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
|
<use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
|
||||||
</svg>
|
</svg> <ng-container i18n>Select</ng-container>
|
||||||
Bulk edit
|
|
||||||
</button>
|
</button>
|
||||||
<div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow">
|
<div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
|
||||||
<button ngbDropdownItem (click)="list.selectPage()">Select page</button>
|
<button ngbDropdownItem (click)="list.selectNone()" i18n>Select none</button>
|
||||||
<button ngbDropdownItem (click)="list.selectAll()">Select all</button>
|
<button ngbDropdownItem (click)="list.selectPage()" i18n>Select page</button>
|
||||||
<button ngbDropdownItem (click)="list.selectNone()">Select none</button>
|
<button ngbDropdownItem (click)="list.selectAll()" i18n>Select all</button>
|
||||||
<div class="dropdown-divider"></div>
|
|
||||||
<button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkSetCorrespondent()">Set correspondent</button>
|
|
||||||
<button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveCorrespondent()">Remove correspondent</button>
|
|
||||||
<button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkSetDocumentType()">Set document type</button>
|
|
||||||
<button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveDocumentType()">Remove document type</button>
|
|
||||||
<button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkAddTag()">Add tag</button>
|
|
||||||
<button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkRemoveTag()">Remove tag</button>
|
|
||||||
<div class="dropdown-divider"></div>
|
|
||||||
<button ngbDropdownItem [disabled]="list.selected.size == 0" (click)="bulkDelete()">Delete</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -87,11 +78,13 @@
|
|||||||
</app-page-header>
|
</app-page-header>
|
||||||
|
|
||||||
<div class="w-100 mb-2 mb-sm-4">
|
<div class="w-100 mb-2 mb-sm-4">
|
||||||
<app-filter-editor [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
|
<app-filter-editor *ngIf="!isBulkEditing" [(filterRules)]="list.filterRules" #filterEditor></app-filter-editor>
|
||||||
|
<app-bulk-editor *ngIf="isBulkEditing"></app-bulk-editor>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="d-flex justify-content-between align-items-center">
|
<div class="d-flex justify-content-between align-items-center">
|
||||||
<p><span *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of </span>{{list.collectionSize || 0}} document(s) <span *ngIf="isFiltered">(filtered)</span></p>
|
<p i18n *ngIf="list.selected.size > 0">Selected {{list.selected.size}} of {{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}</p>
|
||||||
|
<p i18n *ngIf="list.selected.size == 0">{{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}</p>
|
||||||
<ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
|
<ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
|
||||||
[rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
|
[rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination"></ngb-pagination>
|
||||||
</div>
|
</div>
|
||||||
@ -146,7 +139,6 @@
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
<div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
|
<div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
|
||||||
<app-document-card-small [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)" [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
|
<app-document-card-small [selected]="list.isSelected(d)" (selectedChange)="list.setSelected(d, $event)" [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)"></app-document-card-small>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,22 +1,14 @@
|
|||||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import { Observable } from 'rxjs';
|
|
||||||
import { tap } from 'rxjs/operators';
|
|
||||||
import { PaperlessDocument } from 'src/app/data/paperless-document';
|
import { PaperlessDocument } from 'src/app/data/paperless-document';
|
||||||
import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
|
import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
|
||||||
import { DocumentListViewService } from 'src/app/services/document-list-view.service';
|
import { DocumentListViewService } from 'src/app/services/document-list-view.service';
|
||||||
import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
|
import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
|
||||||
import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
|
|
||||||
import { DocumentService, DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
|
|
||||||
import { TagService } from 'src/app/services/rest/tag.service';
|
|
||||||
import { SavedViewService } from 'src/app/services/rest/saved-view.service';
|
import { SavedViewService } from 'src/app/services/rest/saved-view.service';
|
||||||
import { Toast, ToastService } from 'src/app/services/toast.service';
|
import { Toast, ToastService } from 'src/app/services/toast.service';
|
||||||
import { FilterEditorComponent } from '../filter-editor/filter-editor.component';
|
import { FilterEditorComponent } from './filter-editor/filter-editor.component';
|
||||||
import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component';
|
|
||||||
import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component';
|
|
||||||
import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
|
import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
|
||||||
import { OpenDocumentsService } from 'src/app/services/open-documents.service';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-document-list',
|
selector: 'app-document-list',
|
||||||
@ -31,12 +23,7 @@ export class DocumentListComponent implements OnInit {
|
|||||||
public route: ActivatedRoute,
|
public route: ActivatedRoute,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private toastService: ToastService,
|
private toastService: ToastService,
|
||||||
public modalService: NgbModal,
|
private modalService: NgbModal) { }
|
||||||
private correspondentService: CorrespondentService,
|
|
||||||
private documentTypeService: DocumentTypeService,
|
|
||||||
private tagService: TagService,
|
|
||||||
private documentService: DocumentService,
|
|
||||||
private openDocumentService: OpenDocumentsService) { }
|
|
||||||
|
|
||||||
@ViewChild("filterEditor")
|
@ViewChild("filterEditor")
|
||||||
private filterEditor: FilterEditorComponent
|
private filterEditor: FilterEditorComponent
|
||||||
@ -55,6 +42,10 @@ export class DocumentListComponent implements OnInit {
|
|||||||
return DOCUMENT_SORT_FIELDS
|
return DOCUMENT_SORT_FIELDS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get isBulkEditing(): boolean {
|
||||||
|
return this.list.selected.size > 0
|
||||||
|
}
|
||||||
|
|
||||||
saveDisplayMode() {
|
saveDisplayMode() {
|
||||||
localStorage.setItem('document-list:displayMode', this.displayMode)
|
localStorage.setItem('document-list:displayMode', this.displayMode)
|
||||||
}
|
}
|
||||||
@ -115,133 +106,27 @@ export class DocumentListComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
clickTag(tagID: number) {
|
clickTag(tagID: number) {
|
||||||
this.filterEditor.toggleTag(tagID)
|
this.list.selectNone()
|
||||||
|
setTimeout(() => {
|
||||||
|
this.filterEditor.toggleTag(tagID)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
clickCorrespondent(correspondentID: number) {
|
clickCorrespondent(correspondentID: number) {
|
||||||
this.filterEditor.toggleCorrespondent(correspondentID)
|
this.list.selectNone()
|
||||||
|
setTimeout(() => {
|
||||||
|
this.filterEditor.toggleCorrespondent(correspondentID)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
clickDocumentType(documentTypeID: number) {
|
clickDocumentType(documentTypeID: number) {
|
||||||
this.filterEditor.toggleDocumentType(documentTypeID)
|
this.list.selectNone()
|
||||||
|
setTimeout(() => {
|
||||||
|
this.filterEditor.toggleDocumentType(documentTypeID)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
trackByDocumentId(index, item: PaperlessDocument) {
|
trackByDocumentId(index, item: PaperlessDocument) {
|
||||||
return item.id
|
return item.id
|
||||||
}
|
}
|
||||||
|
|
||||||
private executeBulkOperation(method: string, args): Observable<any> {
|
|
||||||
return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
|
|
||||||
tap(() => {
|
|
||||||
this.list.reload()
|
|
||||||
this.list.selected.forEach(id => {
|
|
||||||
this.openDocumentService.refreshDocument(id)
|
|
||||||
})
|
|
||||||
this.list.selectNone()
|
|
||||||
})
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
bulkSetCorrespondent() {
|
|
||||||
let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
|
|
||||||
modal.componentInstance.title = "Select correspondent"
|
|
||||||
modal.componentInstance.message = `Select the correspondent you wish to assign to ${this.list.selected.size} selected document(s):`
|
|
||||||
this.correspondentService.listAll().subscribe(response => {
|
|
||||||
modal.componentInstance.objects = response.results
|
|
||||||
})
|
|
||||||
modal.componentInstance.selectClicked.subscribe(selectedId => {
|
|
||||||
this.executeBulkOperation('set_correspondent', {"correspondent": selectedId}).subscribe(
|
|
||||||
response => {
|
|
||||||
modal.close()
|
|
||||||
}
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
bulkRemoveCorrespondent() {
|
|
||||||
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
|
|
||||||
modal.componentInstance.title = "Remove correspondent"
|
|
||||||
modal.componentInstance.message = `This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).`
|
|
||||||
modal.componentInstance.confirmClicked.subscribe(() => {
|
|
||||||
this.executeBulkOperation('set_correspondent', {"correspondent": null}).subscribe(r => {
|
|
||||||
modal.close()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
bulkSetDocumentType() {
|
|
||||||
let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
|
|
||||||
modal.componentInstance.title = "Select document type"
|
|
||||||
modal.componentInstance.message = `Select the document type you wish to assign to ${this.list.selected.size} selected document(s):`
|
|
||||||
this.documentTypeService.listAll().subscribe(response => {
|
|
||||||
modal.componentInstance.objects = response.results
|
|
||||||
})
|
|
||||||
modal.componentInstance.selectClicked.subscribe(selectedId => {
|
|
||||||
this.executeBulkOperation('set_document_type', {"document_type": selectedId}).subscribe(
|
|
||||||
response => {
|
|
||||||
modal.close()
|
|
||||||
}
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
bulkRemoveDocumentType() {
|
|
||||||
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
|
|
||||||
modal.componentInstance.title = "Remove document type"
|
|
||||||
modal.componentInstance.message = `This operation will remove the document type from all ${this.list.selected.size} selected document(s).`
|
|
||||||
modal.componentInstance.confirmClicked.subscribe(() => {
|
|
||||||
this.executeBulkOperation('set_document_type', {"document_type": null}).subscribe(r => {
|
|
||||||
modal.close()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
bulkAddTag() {
|
|
||||||
let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
|
|
||||||
modal.componentInstance.title = "Select tag"
|
|
||||||
modal.componentInstance.message = `Select the tag you wish to assign to ${this.list.selected.size} selected document(s):`
|
|
||||||
this.tagService.listAll().subscribe(response => {
|
|
||||||
modal.componentInstance.objects = response.results
|
|
||||||
})
|
|
||||||
modal.componentInstance.selectClicked.subscribe(selectedId => {
|
|
||||||
this.executeBulkOperation('add_tag', {"tag": selectedId}).subscribe(
|
|
||||||
response => {
|
|
||||||
modal.close()
|
|
||||||
}
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
bulkRemoveTag() {
|
|
||||||
let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'})
|
|
||||||
modal.componentInstance.title = "Select tag"
|
|
||||||
modal.componentInstance.message = `Select the tag you wish to remove from ${this.list.selected.size} selected document(s):`
|
|
||||||
this.tagService.listAll().subscribe(response => {
|
|
||||||
modal.componentInstance.objects = response.results
|
|
||||||
})
|
|
||||||
modal.componentInstance.selectClicked.subscribe(selectedId => {
|
|
||||||
this.executeBulkOperation('remove_tag', {"tag": selectedId}).subscribe(
|
|
||||||
response => {
|
|
||||||
modal.close()
|
|
||||||
}
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
bulkDelete() {
|
|
||||||
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
|
|
||||||
modal.componentInstance.delayConfirm(5)
|
|
||||||
modal.componentInstance.title = "Delete confirm"
|
|
||||||
modal.componentInstance.messageBold = `This operation will permanently delete all ${this.list.selected.size} selected document(s).`
|
|
||||||
modal.componentInstance.message = `This operation cannot be undone.`
|
|
||||||
modal.componentInstance.btnClass = "btn-danger"
|
|
||||||
modal.componentInstance.btnCaption = "Delete document(s)"
|
|
||||||
modal.componentInstance.confirmClicked.subscribe(() => {
|
|
||||||
this.executeBulkOperation("delete", {}).subscribe(
|
|
||||||
response => {
|
|
||||||
modal.close()
|
|
||||||
}
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,27 @@
|
|||||||
|
<div class="row">
|
||||||
|
<div class="col mb-2 mb-xl-0">
|
||||||
|
<div class="form-inline d-flex">
|
||||||
|
<label class="text-muted mr-2" i18n>Filter by:</label>
|
||||||
|
<input class="form-control form-control-sm flex-grow-1" type="text" [(ngModel)]="titleFilter" placeholder="Title" i18n-placeholder>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="w-100 d-xl-none"></div>
|
||||||
|
<div class="col col-xl-auto mb-2 mb-xl-0">
|
||||||
|
<div class="d-flex">
|
||||||
|
<app-filterable-dropdown class="mr-2 mr-md-3" [items]="tags" [(selectionModel)]="tagSelectionModel" (selectionModelChange)="updateRules()" [multiple]="true" [allowSelectNone]="true" title="Tags" icon="tag-fill" i18n-title></app-filterable-dropdown>
|
||||||
|
<app-filterable-dropdown class="mr-2 mr-md-3" [items]="correspondents" [(selectionModel)]="correspondentSelectionModel" (selectionModelChange)="updateRules()" [allowSelectNone]="true" title="Correspondents" icon="person-fill" i18n-title></app-filterable-dropdown>
|
||||||
|
<app-filterable-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [(selectionModel)]="documentTypeSelectionModel" (selectionModelChange)="updateRules()" [allowSelectNone]="true" title="Document types" icon="file-earmark-fill" i18n-title></app-filterable-dropdown>
|
||||||
|
<app-date-dropdown class="mr-2 mr-md-3" [(dateBefore)]="dateCreatedBefore" [(dateAfter)]="dateCreatedAfter" title="Created" (datesSet)="updateRules()" i18n-title></app-date-dropdown>
|
||||||
|
<app-date-dropdown [(dateBefore)]="dateAddedBefore" [(dateAfter)]="dateAddedAfter" title="Added" (datesSet)="updateRules()" i18n-title></app-date-dropdown>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="w-100 d-xl-none"></div>
|
||||||
|
<div class="col col-xl-auto mb-2 mb-xl-0">
|
||||||
|
<button class="btn btn-link btn-sm px-0 mx-0 ml-xl-n4" [disabled]="!hasFilters()" (click)="clearSelected()">
|
||||||
|
<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
|
||||||
|
</svg> <ng-container i18n>Clear all filters</ng-container>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,192 @@
|
|||||||
|
import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core';
|
||||||
|
import { PaperlessTag } from 'src/app/data/paperless-tag';
|
||||||
|
import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
|
||||||
|
import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
|
||||||
|
import { Subject, Subscription } from 'rxjs';
|
||||||
|
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
|
||||||
|
import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
|
||||||
|
import { TagService } from 'src/app/services/rest/tag.service';
|
||||||
|
import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
|
||||||
|
import { FilterRule } from 'src/app/data/filter-rule';
|
||||||
|
import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE } from 'src/app/data/filter-rule-type';
|
||||||
|
import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
|
||||||
|
import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-filter-editor',
|
||||||
|
templateUrl: './filter-editor.component.html',
|
||||||
|
styleUrls: ['./filter-editor.component.scss']
|
||||||
|
})
|
||||||
|
export class FilterEditorComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
|
generateFilterName() {
|
||||||
|
if (this.filterRules.length == 1) {
|
||||||
|
let rule = this.filterRules[0]
|
||||||
|
switch(this.filterRules[0].rule_type) {
|
||||||
|
|
||||||
|
case FILTER_CORRESPONDENT:
|
||||||
|
return $localize`Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
|
||||||
|
|
||||||
|
case FILTER_DOCUMENT_TYPE:
|
||||||
|
return $localize`Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}`
|
||||||
|
|
||||||
|
case FILTER_HAS_TAG:
|
||||||
|
return $localize`Tag: ${this.tags.find(t => t.id == +rule.value)?.name}`
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private documentTypeService: DocumentTypeService,
|
||||||
|
private tagService: TagService,
|
||||||
|
private correspondentService: CorrespondentService
|
||||||
|
) { }
|
||||||
|
|
||||||
|
tags: PaperlessTag[] = []
|
||||||
|
correspondents: PaperlessCorrespondent[] = []
|
||||||
|
documentTypes: PaperlessDocumentType[] = []
|
||||||
|
|
||||||
|
_titleFilter = ""
|
||||||
|
|
||||||
|
tagSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
|
correspondentSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
|
documentTypeSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
|
|
||||||
|
dateCreatedBefore: string
|
||||||
|
dateCreatedAfter: string
|
||||||
|
dateAddedBefore: string
|
||||||
|
dateAddedAfter: string
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
set filterRules (value: FilterRule[]) {
|
||||||
|
value.forEach(rule => {
|
||||||
|
switch (rule.rule_type) {
|
||||||
|
case FILTER_TITLE:
|
||||||
|
this._titleFilter = rule.value
|
||||||
|
break
|
||||||
|
case FILTER_CREATED_AFTER:
|
||||||
|
this.dateCreatedAfter = rule.value
|
||||||
|
break
|
||||||
|
case FILTER_CREATED_BEFORE:
|
||||||
|
this.dateCreatedBefore = rule.value
|
||||||
|
break
|
||||||
|
case FILTER_ADDED_AFTER:
|
||||||
|
this.dateAddedAfter = rule.value
|
||||||
|
break
|
||||||
|
case FILTER_ADDED_BEFORE:
|
||||||
|
this.dateAddedBefore = rule.value
|
||||||
|
break
|
||||||
|
case FILTER_HAS_TAG:
|
||||||
|
this.tagSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
|
||||||
|
break
|
||||||
|
case FILTER_CORRESPONDENT:
|
||||||
|
this.correspondentSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
|
||||||
|
break
|
||||||
|
case FILTER_DOCUMENT_TYPE:
|
||||||
|
this.documentTypeSelectionModel.set(+rule.value, ToggleableItemState.Selected, false)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
@Output()
|
||||||
|
filterRulesChange = new EventEmitter<FilterRule[]>()
|
||||||
|
|
||||||
|
updateRules() {
|
||||||
|
let filterRules: FilterRule[] = []
|
||||||
|
if (this._titleFilter) {
|
||||||
|
filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter})
|
||||||
|
}
|
||||||
|
if (this.tagSelectionModel.isNoneSelected()) {
|
||||||
|
filterRules.push({rule_type: FILTER_HAS_ANY_TAG, value: "false"})
|
||||||
|
} else {
|
||||||
|
this.tagSelectionModel.getSelectedItems().filter(tag => tag.id).forEach(tag => {
|
||||||
|
filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id?.toString()})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
this.correspondentSelectionModel.getSelectedItems().forEach(correspondent => {
|
||||||
|
filterRules.push({rule_type: FILTER_CORRESPONDENT, value: correspondent.id?.toString()})
|
||||||
|
})
|
||||||
|
this.documentTypeSelectionModel.getSelectedItems().forEach(documentType => {
|
||||||
|
filterRules.push({rule_type: FILTER_DOCUMENT_TYPE, value: documentType.id?.toString()})
|
||||||
|
})
|
||||||
|
if (this.dateCreatedBefore) {
|
||||||
|
filterRules.push({rule_type: FILTER_CREATED_BEFORE, value: this.dateCreatedBefore})
|
||||||
|
}
|
||||||
|
if (this.dateCreatedAfter) {
|
||||||
|
filterRules.push({rule_type: FILTER_CREATED_AFTER, value: this.dateCreatedAfter})
|
||||||
|
}
|
||||||
|
if (this.dateAddedBefore) {
|
||||||
|
filterRules.push({rule_type: FILTER_ADDED_BEFORE, value: this.dateAddedBefore})
|
||||||
|
}
|
||||||
|
if (this.dateAddedAfter) {
|
||||||
|
filterRules.push({rule_type: FILTER_ADDED_AFTER, value: this.dateAddedAfter})
|
||||||
|
}
|
||||||
|
this.filterRulesChange.next(filterRules)
|
||||||
|
}
|
||||||
|
|
||||||
|
hasFilters() {
|
||||||
|
return this._titleFilter ||
|
||||||
|
this.dateAddedAfter || this.dateAddedBefore || this.dateCreatedAfter || this.dateCreatedBefore ||
|
||||||
|
this.tagSelectionModel.selectionSize() || this.correspondentSelectionModel.selectionSize() || this.documentTypeSelectionModel.selectionSize()
|
||||||
|
}
|
||||||
|
|
||||||
|
get titleFilter() {
|
||||||
|
return this._titleFilter
|
||||||
|
}
|
||||||
|
|
||||||
|
set titleFilter(value) {
|
||||||
|
this.titleFilterDebounce.next(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
titleFilterDebounce: Subject<string>
|
||||||
|
subscription: Subscription
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.tagService.listAll().subscribe(result => this.tags = result.results)
|
||||||
|
this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
|
||||||
|
this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
|
||||||
|
|
||||||
|
this.titleFilterDebounce = new Subject<string>()
|
||||||
|
|
||||||
|
this.subscription = this.titleFilterDebounce.pipe(
|
||||||
|
debounceTime(400),
|
||||||
|
distinctUntilChanged()
|
||||||
|
).subscribe(title => {
|
||||||
|
this._titleFilter = title
|
||||||
|
this.updateRules()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy() {
|
||||||
|
this.titleFilterDebounce.complete()
|
||||||
|
}
|
||||||
|
|
||||||
|
clearSelected() {
|
||||||
|
this._titleFilter = ""
|
||||||
|
this.tagSelectionModel.clear(false)
|
||||||
|
this.documentTypeSelectionModel.clear(false)
|
||||||
|
this.correspondentSelectionModel.clear(false)
|
||||||
|
this.dateAddedBefore = null
|
||||||
|
this.dateAddedAfter = null
|
||||||
|
this.dateCreatedBefore = null
|
||||||
|
this.dateCreatedAfter = null
|
||||||
|
this.updateRules()
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleTag(tagId: number) {
|
||||||
|
this.tagSelectionModel.toggle(tagId)
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleCorrespondent(correspondentId: number) {
|
||||||
|
this.correspondentSelectionModel.toggle(correspondentId)
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleDocumentType(documentTypeId: number) {
|
||||||
|
this.documentTypeSelectionModel.toggle(documentTypeId)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,12 +0,0 @@
|
|||||||
<button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-left-0 border-right-0 border-bottom" role="menuitem" (click)="toggleItem()">
|
|
||||||
<div class="selected-icon mr-1">
|
|
||||||
<svg *ngIf="selected" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<div class="mr-1">
|
|
||||||
<app-tag *ngIf="isTag; else displayName" [tag]="item" [clickable]="true" linkTitle="Filter by tag"></app-tag>
|
|
||||||
<ng-template #displayName><small>{{item.name}}</small></ng-template>
|
|
||||||
</div>
|
|
||||||
<div class="badge badge-light rounded-pill ml-auto mr-1">{{item.document_count}}</div>
|
|
||||||
</button>
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
|
||||||
|
|
||||||
import { FilterDropodownButtonComponent } from './filter-dropdown-button.component';
|
|
||||||
|
|
||||||
describe('FilterDropodownButtonComponent', () => {
|
|
||||||
let component: FilterDropodownButtonComponent;
|
|
||||||
let fixture: ComponentFixture<FilterDropodownButtonComponent>;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
await TestBed.configureTestingModule({
|
|
||||||
declarations: [ FilterDropodownButtonComponent ]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
fixture = TestBed.createComponent(FilterDropodownButtonComponent);
|
|
||||||
component = fixture.componentInstance;
|
|
||||||
fixture.detectChanges();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create', () => {
|
|
||||||
expect(component).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
|
|
||||||
import { PaperlessTag } from 'src/app/data/paperless-tag';
|
|
||||||
import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
|
|
||||||
import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-filter-dropdown-button',
|
|
||||||
templateUrl: './filter-dropdown-button.component.html',
|
|
||||||
styleUrls: ['./filter-dropdown-button.component.scss']
|
|
||||||
})
|
|
||||||
export class FilterDropdownButtonComponent implements OnInit {
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
selected: boolean
|
|
||||||
|
|
||||||
@Output()
|
|
||||||
toggle = new EventEmitter()
|
|
||||||
|
|
||||||
isTag: boolean
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
this.isTag = 'is_inbox_tag' in this.item // ~ this.item instanceof PaperlessTag
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleItem(): void {
|
|
||||||
this.selected = !this.selected
|
|
||||||
this.toggle.emit(this.item)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
<div class="btn-group" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #filterDropdown="ngbDropdown">
|
|
||||||
<button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="itemsSelected?.length > 0 ? 'btn-primary' : 'btn-outline-primary'">
|
|
||||||
<div class="d-none d-md-inline">{{title}}</div>
|
|
||||||
<div class="d-inline-block d-md-none">
|
|
||||||
<svg class="toolbaricon" fill="currentColor">
|
|
||||||
<use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<ng-container *ngIf="itemsSelected?.length > 0">
|
|
||||||
<div class="badge bg-secondary text-light rounded-pill badge-corner">
|
|
||||||
{{itemsSelected?.length}}
|
|
||||||
</div>
|
|
||||||
</ng-container>
|
|
||||||
</button>
|
|
||||||
<div class="dropdown-menu py-0 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
|
|
||||||
<div class="list-group list-group-flush">
|
|
||||||
<div class="list-group-item">
|
|
||||||
<div class="input-group input-group-sm">
|
|
||||||
<input class="form-control" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div *ngIf="items" class="items">
|
|
||||||
<ng-container *ngFor="let item of items | filter: filterText; let i = index">
|
|
||||||
<app-filter-dropdown-button [item]="item" [selected]="isItemSelected(item)" (toggle)="toggleItem($event)"></app-filter-dropdown-button>
|
|
||||||
</ng-container>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
|
|
||||||
import { ObjectWithId } from 'src/app/data/object-with-id';
|
|
||||||
import { FilterPipe } from 'src/app/pipes/filter.pipe';
|
|
||||||
import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-filter-dropdown',
|
|
||||||
templateUrl: './filter-dropdown.component.html',
|
|
||||||
styleUrls: ['./filter-dropdown.component.scss']
|
|
||||||
})
|
|
||||||
export class FilterDropdownComponent {
|
|
||||||
|
|
||||||
constructor(private filterPipe: FilterPipe) { }
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
items: ObjectWithId[]
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
itemsSelected: ObjectWithId[]
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
title: string
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
icon: string
|
|
||||||
|
|
||||||
@Output()
|
|
||||||
toggle = new EventEmitter()
|
|
||||||
|
|
||||||
@ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
|
|
||||||
@ViewChild('filterDropdown') filterDropdown: NgbDropdown
|
|
||||||
|
|
||||||
filterText: string
|
|
||||||
|
|
||||||
toggleItem(item: ObjectWithId): void {
|
|
||||||
this.toggle.emit(item)
|
|
||||||
}
|
|
||||||
|
|
||||||
isItemSelected(item: ObjectWithId): boolean {
|
|
||||||
return this.itemsSelected?.find(i => i.id == item.id) !== undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
dropdownOpenChange(open: boolean): void {
|
|
||||||
if (open) {
|
|
||||||
setTimeout(() => {
|
|
||||||
this.listFilterTextInput.nativeElement.focus();
|
|
||||||
}, 0);
|
|
||||||
} else {
|
|
||||||
this.filterText = ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
listFilterEnter(): void {
|
|
||||||
let filtered = this.filterPipe.transform(this.items, this.filterText)
|
|
||||||
if (filtered.length == 1) this.toggleItem(filtered.shift())
|
|
||||||
this.filterDropdown.close()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
<div class="row">
|
|
||||||
<div class="col mb-2 mb-xl-0">
|
|
||||||
<div class="form-inline d-flex">
|
|
||||||
<label class="text-muted mr-2">Filter by:</label>
|
|
||||||
<input class="form-control form-control-sm flex-grow-1" type="text" [(ngModel)]="titleFilter" placeholder="Title">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="w-100 d-xl-none"></div>
|
|
||||||
<div class="col col-xl-auto mb-2 mb-xl-0">
|
|
||||||
<div class="d-flex">
|
|
||||||
<app-filter-dropdown class="mr-2 mr-md-3" [items]="tags" [itemsSelected]="selectedTags" title="Tags" icon="tag-fill" (toggle)="toggleTag($event.id)"></app-filter-dropdown>
|
|
||||||
<app-filter-dropdown class="mr-2 mr-md-3" [items]="correspondents" [itemsSelected]="selectedCorrespondents" title="Correspondents" icon="person-fill" (toggle)="toggleCorrespondent($event.id)"></app-filter-dropdown>
|
|
||||||
<app-filter-dropdown class="mr-2 mr-md-3" [items]="documentTypes" [itemsSelected]="selectedDocumentTypes" title="Document types" icon="file-earmark-fill" (toggle)="toggleDocumentType($event.id)"></app-filter-dropdown>
|
|
||||||
<app-filter-dropdown-date class="mr-2 mr-md-3" [dateBefore]="dateCreatedBefore" [dateAfter]="dateCreatedAfter" title="Created" (datesSet)="onDatesCreatedSet($event)"></app-filter-dropdown-date>
|
|
||||||
<app-filter-dropdown-date [dateBefore]="dateAddedBefore" [dateAfter]="dateAddedAfter" title="Added" (datesSet)="onDatesAddedSet($event)"></app-filter-dropdown-date>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="w-100 d-xl-none"></div>
|
|
||||||
<div class="col col-xl-auto mb-2 mb-xl-0">
|
|
||||||
<button class="btn btn-link btn-sm px-0 mx-0 ml-xl-n4" [disabled]="!hasFilters()" (click)="clearSelected()">
|
|
||||||
<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
|
|
||||||
</svg>
|
|
||||||
Clear all filters
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,239 +0,0 @@
|
|||||||
import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core';
|
|
||||||
import { PaperlessTag } from 'src/app/data/paperless-tag';
|
|
||||||
import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
|
|
||||||
import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
|
|
||||||
import { Subject, Subscription } from 'rxjs';
|
|
||||||
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
|
|
||||||
import { NgbDateParserFormatter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
|
|
||||||
import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
|
|
||||||
import { TagService } from 'src/app/services/rest/tag.service';
|
|
||||||
import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
|
|
||||||
import { FilterRule } from 'src/app/data/filter-rule';
|
|
||||||
import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES, FILTER_TITLE } from 'src/app/data/filter-rule-type';
|
|
||||||
import { DateSelection } from './filter-dropdown-date/filter-dropdown-date.component';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-filter-editor',
|
|
||||||
templateUrl: './filter-editor.component.html',
|
|
||||||
styleUrls: ['./filter-editor.component.scss']
|
|
||||||
})
|
|
||||||
export class FilterEditorComponent implements OnInit, OnDestroy {
|
|
||||||
|
|
||||||
generateFilterName() {
|
|
||||||
if (this.filterRules.length == 1) {
|
|
||||||
let rule = this.filterRules[0]
|
|
||||||
switch(this.filterRules[0].rule_type) {
|
|
||||||
|
|
||||||
case FILTER_CORRESPONDENT:
|
|
||||||
return `Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}`
|
|
||||||
|
|
||||||
case FILTER_DOCUMENT_TYPE:
|
|
||||||
return `Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}`
|
|
||||||
|
|
||||||
case FILTER_HAS_TAG:
|
|
||||||
return `Tag: ${this.tags.find(t => t.id == +rule.value)?.name}`
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private documentTypeService: DocumentTypeService,
|
|
||||||
private tagService: TagService,
|
|
||||||
private correspondentService: CorrespondentService,
|
|
||||||
private dateParser: NgbDateParserFormatter
|
|
||||||
) { }
|
|
||||||
|
|
||||||
tags: PaperlessTag[] = []
|
|
||||||
correspondents: PaperlessCorrespondent[]
|
|
||||||
documentTypes: PaperlessDocumentType[] = []
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
filterRules: FilterRule[]
|
|
||||||
|
|
||||||
@Output()
|
|
||||||
filterRulesChange = new EventEmitter<FilterRule[]>()
|
|
||||||
|
|
||||||
hasFilters() {
|
|
||||||
return this.filterRules.length > 0
|
|
||||||
}
|
|
||||||
|
|
||||||
get selectedTags(): PaperlessTag[] {
|
|
||||||
let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_HAS_TAG)
|
|
||||||
return this.tags?.filter(t => tagRules.find(tr => +tr.value == t.id))
|
|
||||||
}
|
|
||||||
|
|
||||||
get selectedCorrespondents(): PaperlessCorrespondent[] {
|
|
||||||
let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_CORRESPONDENT)
|
|
||||||
return this.correspondents?.filter(c => correspondentRules.find(cr => +cr.value == c.id))
|
|
||||||
}
|
|
||||||
|
|
||||||
get selectedDocumentTypes(): PaperlessDocumentType[] {
|
|
||||||
let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.rule_type == FILTER_DOCUMENT_TYPE)
|
|
||||||
return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => +dtr.value == dt.id))
|
|
||||||
}
|
|
||||||
|
|
||||||
get titleFilter() {
|
|
||||||
let existingRule = this.filterRules.find(rule => rule.rule_type == FILTER_TITLE)
|
|
||||||
return existingRule ? existingRule.value : ''
|
|
||||||
}
|
|
||||||
|
|
||||||
set titleFilter(value) {
|
|
||||||
this.titleFilterDebounce.next(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
titleFilterDebounce: Subject<string>
|
|
||||||
subscription: Subscription
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
this.tagService.listAll().subscribe(result => this.tags = result.results)
|
|
||||||
this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
|
|
||||||
this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
|
|
||||||
|
|
||||||
this.titleFilterDebounce = new Subject<string>()
|
|
||||||
|
|
||||||
this.subscription = this.titleFilterDebounce.pipe(
|
|
||||||
debounceTime(400),
|
|
||||||
distinctUntilChanged()
|
|
||||||
).subscribe(title => {
|
|
||||||
this.setTitleRule(title)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnDestroy() {
|
|
||||||
this.titleFilterDebounce.complete()
|
|
||||||
// TODO: not sure if both is necessary
|
|
||||||
this.subscription.unsubscribe()
|
|
||||||
}
|
|
||||||
|
|
||||||
applyFilters() {
|
|
||||||
this.filterRulesChange.next(this.filterRules)
|
|
||||||
}
|
|
||||||
|
|
||||||
clearSelected() {
|
|
||||||
this.filterRules = []
|
|
||||||
this.applyFilters()
|
|
||||||
}
|
|
||||||
|
|
||||||
private toggleFilterRule(filterRuleTypeID: number, value: number) {
|
|
||||||
|
|
||||||
let filterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
|
|
||||||
|
|
||||||
let existingRule = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID && rule.value == value?.toString())
|
|
||||||
let existingRuleOfSameType = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID)
|
|
||||||
|
|
||||||
if (existingRule) {
|
|
||||||
// if this exact rule already exists, remove it in all cases.
|
|
||||||
this.filterRules.splice(this.filterRules.indexOf(existingRule), 1)
|
|
||||||
} else if (filterRuleType.multi || !existingRuleOfSameType) {
|
|
||||||
// if we allow multiple rules per type, or no rule of this type already exists, push a new rule.
|
|
||||||
this.filterRules.push({rule_type: filterRuleTypeID, value: value?.toString()})
|
|
||||||
} else {
|
|
||||||
// otherwise (i.e., no multi support AND there's already a rule of this type), update the rule.
|
|
||||||
existingRuleOfSameType.value = value?.toString()
|
|
||||||
}
|
|
||||||
this.applyFilters()
|
|
||||||
}
|
|
||||||
|
|
||||||
private setTitleRule(title: string) {
|
|
||||||
let existingRule = this.filterRules.find(rule => rule.rule_type == FILTER_TITLE)
|
|
||||||
|
|
||||||
if (!existingRule && title) {
|
|
||||||
this.filterRules.push({rule_type: FILTER_TITLE, value: title})
|
|
||||||
} else if (existingRule && !title) {
|
|
||||||
this.filterRules.splice(this.filterRules.findIndex(rule => rule.rule_type == FILTER_TITLE), 1)
|
|
||||||
} else if (existingRule && title) {
|
|
||||||
existingRule.value = title
|
|
||||||
}
|
|
||||||
this.applyFilters()
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleTag(tagId: number) {
|
|
||||||
this.toggleFilterRule(FILTER_HAS_TAG, tagId)
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleCorrespondent(correspondentId: number) {
|
|
||||||
this.toggleFilterRule(FILTER_CORRESPONDENT, correspondentId)
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleDocumentType(documentTypeId: number) {
|
|
||||||
this.toggleFilterRule(FILTER_DOCUMENT_TYPE, documentTypeId)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Date handling
|
|
||||||
|
|
||||||
|
|
||||||
onDatesCreatedSet(dates: DateSelection) {
|
|
||||||
this.setDateCreatedBefore(dates.before)
|
|
||||||
this.setDateCreatedAfter(dates.after)
|
|
||||||
this.applyFilters()
|
|
||||||
}
|
|
||||||
|
|
||||||
onDatesAddedSet(dates: DateSelection) {
|
|
||||||
this.setDateAddedBefore(dates.before)
|
|
||||||
this.setDateAddedAfter(dates.after)
|
|
||||||
this.applyFilters()
|
|
||||||
}
|
|
||||||
|
|
||||||
get dateCreatedBefore(): string {
|
|
||||||
let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE)
|
|
||||||
return createdBeforeRule ? createdBeforeRule.value : null
|
|
||||||
}
|
|
||||||
|
|
||||||
get dateCreatedAfter(): string {
|
|
||||||
let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER)
|
|
||||||
return createdAfterRule ? createdAfterRule.value : null
|
|
||||||
}
|
|
||||||
|
|
||||||
get dateAddedBefore(): string {
|
|
||||||
let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE)
|
|
||||||
return addedBeforeRule ? addedBeforeRule.value : null
|
|
||||||
}
|
|
||||||
|
|
||||||
get dateAddedAfter(): string {
|
|
||||||
let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER)
|
|
||||||
return addedAfterRule ? addedAfterRule.value : null
|
|
||||||
}
|
|
||||||
|
|
||||||
setDateCreatedBefore(date?: string) {
|
|
||||||
if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE)
|
|
||||||
else this.clearDateFilter(FILTER_CREATED_BEFORE)
|
|
||||||
}
|
|
||||||
|
|
||||||
setDateCreatedAfter(date?: string) {
|
|
||||||
if (date) this.setDateFilter(date, FILTER_CREATED_AFTER)
|
|
||||||
else this.clearDateFilter(FILTER_CREATED_AFTER)
|
|
||||||
}
|
|
||||||
|
|
||||||
setDateAddedBefore(date?: string) {
|
|
||||||
if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE)
|
|
||||||
else this.clearDateFilter(FILTER_ADDED_BEFORE)
|
|
||||||
}
|
|
||||||
|
|
||||||
setDateAddedAfter(date?: string) {
|
|
||||||
if (date) this.setDateFilter(date, FILTER_ADDED_AFTER)
|
|
||||||
else this.clearDateFilter(FILTER_ADDED_AFTER)
|
|
||||||
}
|
|
||||||
|
|
||||||
setDateFilter(date: string, dateRuleTypeID: number) {
|
|
||||||
let existingRule = this.filterRules.find(rule => rule.rule_type == dateRuleTypeID)
|
|
||||||
|
|
||||||
if (existingRule) {
|
|
||||||
existingRule.value = date
|
|
||||||
} else {
|
|
||||||
this.filterRules.push({rule_type: dateRuleTypeID, value: date})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
clearDateFilter(dateRuleTypeID: number) {
|
|
||||||
let ruleIndex = this.filterRules.findIndex(rule => rule.rule_type == dateRuleTypeID)
|
|
||||||
if (ruleIndex != -1) {
|
|
||||||
this.filterRules.splice(ruleIndex, 1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -3,21 +3,19 @@
|
|||||||
|
|
||||||
<div *ngIf="errorMessage" class="alert alert-danger" i18n>Invalid search query: {{errorMessage}}</div>
|
<div *ngIf="errorMessage" class="alert alert-danger" i18n>Invalid search query: {{errorMessage}}</div>
|
||||||
|
|
||||||
<p *ngIf="more_like">
|
<p *ngIf="more_like" i18n>
|
||||||
Showing documents similar to
|
Showing documents similar to <a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a>
|
||||||
<a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a>
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p *ngIf="query">
|
<p *ngIf="query">
|
||||||
Search string: <i>{{query}}</i>
|
<ng-container i18n>Search query: <i>{{query}}</i></ng-container>
|
||||||
<ng-container *ngIf="correctedQuery">
|
<ng-container *ngIf="correctedQuery">
|
||||||
- Did you mean "<a [routerLink]="" (click)="searchCorrectedQuery()">{{correctedQuery}}</a>"?
|
- <ng-container i18n>Did you mean "<a [routerLink]="" (click)="searchCorrectedQuery()">{{correctedQuery}}</a>"?</ng-container>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div *ngIf="!errorMessage" [class.result-content-searching]="searching" infiniteScroll (scrolled)="onScroll()">
|
<div *ngIf="!errorMessage" [class.result-content-searching]="searching" infiniteScroll (scrolled)="onScroll()">
|
||||||
<p>{{resultCount}} result(s)</p>
|
<p i18n>{resultCount, plural, =0 {No results} =1 {One result} other {{{resultCount}} results}}</p>
|
||||||
<app-document-card-large *ngFor="let result of results"
|
<app-document-card-large *ngFor="let result of results"
|
||||||
[document]="result.document"
|
[document]="result.document"
|
||||||
[details]="result.highlights"
|
[details]="result.highlights"
|
||||||
|
|||||||
@ -25,8 +25,8 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
|
|||||||
|
|
||||||
{id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
|
{id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
|
||||||
|
|
||||||
{id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
|
{id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", isnull_filtervar: "correspondent__isnull", datatype: "correspondent", multi: false},
|
||||||
{id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", datatype: "document_type", multi: false},
|
{id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false},
|
||||||
|
|
||||||
{id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
|
{id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
|
||||||
{id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},
|
{id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},
|
||||||
@ -51,6 +51,7 @@ export interface FilterRuleType {
|
|||||||
id: number
|
id: number
|
||||||
name: string
|
name: string
|
||||||
filtervar: string
|
filtervar: string
|
||||||
|
isnull_filtervar?: string
|
||||||
datatype: string //number, string, boolean, date
|
datatype: string //number, string, boolean, date
|
||||||
multi: boolean
|
multi: boolean
|
||||||
default?: any
|
default?: any
|
||||||
|
|||||||
@ -29,4 +29,6 @@ export interface MatchingModel extends ObjectWithId {
|
|||||||
|
|
||||||
is_insensitive?: boolean
|
is_insensitive?: boolean
|
||||||
|
|
||||||
|
document_count?: number
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,6 @@
|
|||||||
import { MatchingModel } from './matching-model';
|
import { MatchingModel } from './matching-model';
|
||||||
|
|
||||||
export interface PaperlessCorrespondent extends MatchingModel {
|
export interface PaperlessCorrespondent extends MatchingModel {
|
||||||
|
|
||||||
document_count?: number
|
|
||||||
|
|
||||||
last_correspondence?: Date
|
last_correspondence?: Date
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,4 @@ import { MatchingModel } from './matching-model';
|
|||||||
|
|
||||||
export interface PaperlessDocumentType extends MatchingModel {
|
export interface PaperlessDocumentType extends MatchingModel {
|
||||||
|
|
||||||
document_count?: number
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,19 +3,19 @@ import { ObjectWithId } from './object-with-id';
|
|||||||
|
|
||||||
|
|
||||||
export const TAG_COLOURS = [
|
export const TAG_COLOURS = [
|
||||||
{id: 1, value: "#a6cee3", name: "Light Blue", textColor: "#000000"},
|
{id: 1, value: "#a6cee3", name: $localize`Light blue`, textColor: "#000000"},
|
||||||
{id: 2, value: "#1f78b4", name: "Blue", textColor: "#ffffff"},
|
{id: 2, value: "#1f78b4", name: $localize`Blue`, textColor: "#ffffff"},
|
||||||
{id: 3, value: "#b2df8a", name: "Light Green", textColor: "#000000"},
|
{id: 3, value: "#b2df8a", name: $localize`Light green`, textColor: "#000000"},
|
||||||
{id: 4, value: "#33a02c", name: "Green", textColor: "#ffffff"},
|
{id: 4, value: "#33a02c", name: $localize`Green`, textColor: "#ffffff"},
|
||||||
{id: 5, value: "#fb9a99", name: "Light Red", textColor: "#000000"},
|
{id: 5, value: "#fb9a99", name: $localize`Light red`, textColor: "#000000"},
|
||||||
{id: 6, value: "#e31a1c", name: "Red ", textColor: "#ffffff"},
|
{id: 6, value: "#e31a1c", name: $localize`Red `, textColor: "#ffffff"},
|
||||||
{id: 7, value: "#fdbf6f", name: "Light Orange", textColor: "#000000"},
|
{id: 7, value: "#fdbf6f", name: $localize`Light orange`, textColor: "#000000"},
|
||||||
{id: 8, value: "#ff7f00", name: "Orange", textColor: "#000000"},
|
{id: 8, value: "#ff7f00", name: $localize`Orange`, textColor: "#000000"},
|
||||||
{id: 9, value: "#cab2d6", name: "Light Violet", textColor: "#000000"},
|
{id: 9, value: "#cab2d6", name: $localize`Light violet`, textColor: "#000000"},
|
||||||
{id: 10, value: "#6a3d9a", name: "Violet", textColor: "#ffffff"},
|
{id: 10, value: "#6a3d9a", name: $localize`Violet`, textColor: "#ffffff"},
|
||||||
{id: 11, value: "#b15928", name: "Brown", textColor: "#ffffff"},
|
{id: 11, value: "#b15928", name: $localize`Brown`, textColor: "#ffffff"},
|
||||||
{id: 12, value: "#000000", name: "Black", textColor: "#ffffff"},
|
{id: 12, value: "#000000", name: $localize`Black`, textColor: "#ffffff"},
|
||||||
{id: 13, value: "#cccccc", name: "Light Grey", textColor: "#000000"}
|
{id: 13, value: "#cccccc", name: $localize`Light grey`, textColor: "#000000"}
|
||||||
]
|
]
|
||||||
|
|
||||||
export interface PaperlessTag extends MatchingModel {
|
export interface PaperlessTag extends MatchingModel {
|
||||||
@ -23,6 +23,5 @@ export interface PaperlessTag extends MatchingModel {
|
|||||||
colour?: number
|
colour?: number
|
||||||
|
|
||||||
is_inbox_tag?: boolean
|
is_inbox_tag?: boolean
|
||||||
|
|
||||||
document_count?: number
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,7 +9,7 @@ export class DocumentTitlePipe implements PipeTransform {
|
|||||||
if (value) {
|
if (value) {
|
||||||
return value
|
return value
|
||||||
} else {
|
} else {
|
||||||
return "(no title)"
|
return $localize`(no title)`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,12 @@
|
|||||||
import { Pipe, PipeTransform } from '@angular/core';
|
import { Pipe, PipeTransform } from '@angular/core';
|
||||||
|
import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
|
||||||
|
import { MatchingModel } from '../data/matching-model';
|
||||||
|
|
||||||
@Pipe({
|
@Pipe({
|
||||||
name: 'filter'
|
name: 'filter'
|
||||||
})
|
})
|
||||||
export class FilterPipe implements PipeTransform {
|
export class FilterPipe implements PipeTransform {
|
||||||
transform(items: any[], searchText: string): any[] {
|
transform(items: MatchingModel[], searchText: string): MatchingModel[] {
|
||||||
if (!items) return [];
|
if (!items) return [];
|
||||||
if (!searchText) return items;
|
if (!searchText) return items;
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import { Pipe, PipeTransform } from '@angular/core';
|
|||||||
export class YesNoPipe implements PipeTransform {
|
export class YesNoPipe implements PipeTransform {
|
||||||
|
|
||||||
transform(value: boolean): unknown {
|
transform(value: boolean): unknown {
|
||||||
return value ? "Yes" : "No"
|
return value ? $localize`Yes` : $localize`No`
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,27 +74,31 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clearCache() {
|
||||||
|
this._listAll = null
|
||||||
|
}
|
||||||
|
|
||||||
get(id: number): Observable<T> {
|
get(id: number): Observable<T> {
|
||||||
return this.http.get<T>(this.getResourceUrl(id))
|
return this.http.get<T>(this.getResourceUrl(id))
|
||||||
}
|
}
|
||||||
|
|
||||||
create(o: T): Observable<T> {
|
create(o: T): Observable<T> {
|
||||||
this._listAll = null
|
this.clearCache()
|
||||||
return this.http.post<T>(this.getResourceUrl(), o)
|
return this.http.post<T>(this.getResourceUrl(), o)
|
||||||
}
|
}
|
||||||
|
|
||||||
delete(o: T): Observable<any> {
|
delete(o: T): Observable<any> {
|
||||||
this._listAll = null
|
this.clearCache()
|
||||||
return this.http.delete(this.getResourceUrl(o.id))
|
return this.http.delete(this.getResourceUrl(o.id))
|
||||||
}
|
}
|
||||||
|
|
||||||
update(o: T): Observable<T> {
|
update(o: T): Observable<T> {
|
||||||
this._listAll = null
|
this.clearCache()
|
||||||
return this.http.put<T>(this.getResourceUrl(o.id), o)
|
return this.http.put<T>(this.getResourceUrl(o.id), o)
|
||||||
}
|
}
|
||||||
|
|
||||||
patch(o: T): Observable<T> {
|
patch(o: T): Observable<T> {
|
||||||
this._listAll = null
|
this.clearCache()
|
||||||
return this.http.patch<T>(this.getResourceUrl(o.id), o)
|
return this.http.patch<T>(this.getResourceUrl(o.id), o)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
|
|||||||
import { PaperlessDocument } from 'src/app/data/paperless-document';
|
import { PaperlessDocument } from 'src/app/data/paperless-document';
|
||||||
import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata';
|
import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata';
|
||||||
import { AbstractPaperlessService } from './abstract-paperless-service';
|
import { AbstractPaperlessService } from './abstract-paperless-service';
|
||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient, HttpParams } from '@angular/common/http';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { Results } from 'src/app/data/results';
|
import { Results } from 'src/app/data/results';
|
||||||
import { FilterRule } from 'src/app/data/filter-rule';
|
import { FilterRule } from 'src/app/data/filter-rule';
|
||||||
@ -22,6 +22,17 @@ export const DOCUMENT_SORT_FIELDS = [
|
|||||||
{ field: 'modified', name: $localize`Modified` }
|
{ field: 'modified', name: $localize`Modified` }
|
||||||
]
|
]
|
||||||
|
|
||||||
|
export interface SelectionDataItem {
|
||||||
|
id: number
|
||||||
|
document_count: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SelectionData {
|
||||||
|
selected_correspondents: SelectionDataItem[]
|
||||||
|
selected_tags: SelectionDataItem[]
|
||||||
|
selected_document_types: SelectionDataItem[]
|
||||||
|
}
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
@ -38,6 +49,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
|
|||||||
let ruleType = FILTER_RULE_TYPES.find(t => t.id == rule.rule_type)
|
let ruleType = FILTER_RULE_TYPES.find(t => t.id == rule.rule_type)
|
||||||
if (ruleType.multi) {
|
if (ruleType.multi) {
|
||||||
params[ruleType.filtervar] = params[ruleType.filtervar] ? params[ruleType.filtervar] + "," + rule.value : rule.value
|
params[ruleType.filtervar] = params[ruleType.filtervar] ? params[ruleType.filtervar] + "," + rule.value : rule.value
|
||||||
|
} else if (ruleType.isnull_filtervar && rule.value == null) {
|
||||||
|
params[ruleType.isnull_filtervar] = true
|
||||||
} else {
|
} else {
|
||||||
params[ruleType.filtervar] = rule.value
|
params[ruleType.filtervar] = rule.value
|
||||||
}
|
}
|
||||||
@ -112,4 +125,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getSelectionData(ids: number[]): Observable<SelectionData> {
|
||||||
|
return this.http.post<SelectionData>(this.getResourceUrl(null, 'selection_data'), {"documents": ids})
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -100,3 +100,13 @@ body {
|
|||||||
padding-top: 1px;
|
padding-top: 1px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@supports (-webkit-touch-callout: none) {
|
||||||
|
input[type="number"],
|
||||||
|
input[type="search"],
|
||||||
|
input[type="text"],
|
||||||
|
select:focus,
|
||||||
|
textarea {
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
|
import itertools
|
||||||
|
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django_q.tasks import async_task
|
from django_q.tasks import async_task
|
||||||
|
from whoosh.writing import AsyncWriter
|
||||||
|
|
||||||
|
from documents import index
|
||||||
from documents.models import Document, Correspondent, DocumentType
|
from documents.models import Document, Correspondent, DocumentType
|
||||||
|
|
||||||
|
|
||||||
@ -13,7 +17,8 @@ def set_correspondent(doc_ids, correspondent):
|
|||||||
affected_docs = [doc.id for doc in qs]
|
affected_docs = [doc.id for doc in qs]
|
||||||
qs.update(correspondent=correspondent)
|
qs.update(correspondent=correspondent)
|
||||||
|
|
||||||
async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
|
async_task(
|
||||||
|
"documents.tasks.bulk_update_documents", document_ids=affected_docs)
|
||||||
|
|
||||||
return "OK"
|
return "OK"
|
||||||
|
|
||||||
@ -27,7 +32,8 @@ def set_document_type(doc_ids, document_type):
|
|||||||
affected_docs = [doc.id for doc in qs]
|
affected_docs = [doc.id for doc in qs]
|
||||||
qs.update(document_type=document_type)
|
qs.update(document_type=document_type)
|
||||||
|
|
||||||
async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
|
async_task(
|
||||||
|
"documents.tasks.bulk_update_documents", document_ids=affected_docs)
|
||||||
|
|
||||||
return "OK"
|
return "OK"
|
||||||
|
|
||||||
@ -44,7 +50,8 @@ def add_tag(doc_ids, tag):
|
|||||||
document_id=doc, tag_id=tag) for doc in affected_docs
|
document_id=doc, tag_id=tag) for doc in affected_docs
|
||||||
])
|
])
|
||||||
|
|
||||||
async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
|
async_task(
|
||||||
|
"documents.tasks.bulk_update_documents", document_ids=affected_docs)
|
||||||
|
|
||||||
return "OK"
|
return "OK"
|
||||||
|
|
||||||
@ -61,7 +68,30 @@ def remove_tag(doc_ids, tag):
|
|||||||
Q(tag_id=tag)
|
Q(tag_id=tag)
|
||||||
).delete()
|
).delete()
|
||||||
|
|
||||||
async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs)
|
async_task(
|
||||||
|
"documents.tasks.bulk_update_documents", document_ids=affected_docs)
|
||||||
|
|
||||||
|
return "OK"
|
||||||
|
|
||||||
|
|
||||||
|
def modify_tags(doc_ids, add_tags, remove_tags):
|
||||||
|
qs = Document.objects.filter(id__in=doc_ids)
|
||||||
|
affected_docs = [doc.id for doc in qs]
|
||||||
|
|
||||||
|
DocumentTagRelationship = Document.tags.through
|
||||||
|
|
||||||
|
DocumentTagRelationship.objects.filter(
|
||||||
|
document_id__in=affected_docs,
|
||||||
|
tag_id__in=remove_tags,
|
||||||
|
).delete()
|
||||||
|
|
||||||
|
DocumentTagRelationship.objects.bulk_create([DocumentTagRelationship(
|
||||||
|
document_id=doc, tag_id=tag) for (doc, tag) in itertools.product(
|
||||||
|
affected_docs, add_tags)
|
||||||
|
], ignore_conflicts=True)
|
||||||
|
|
||||||
|
async_task(
|
||||||
|
"documents.tasks.bulk_update_documents", document_ids=affected_docs)
|
||||||
|
|
||||||
return "OK"
|
return "OK"
|
||||||
|
|
||||||
@ -69,4 +99,9 @@ def remove_tag(doc_ids, tag):
|
|||||||
def delete(doc_ids):
|
def delete(doc_ids):
|
||||||
Document.objects.filter(id__in=doc_ids).delete()
|
Document.objects.filter(id__in=doc_ids).delete()
|
||||||
|
|
||||||
|
ix = index.open_index()
|
||||||
|
with AsyncWriter(ix) as writer:
|
||||||
|
for id in doc_ids:
|
||||||
|
index.remove_document_by_id(writer, id)
|
||||||
|
|
||||||
return "OK"
|
return "OK"
|
||||||
|
|||||||
@ -105,7 +105,8 @@ class Consumer(LoggingMixin):
|
|||||||
|
|
||||||
parser_class = get_parser_class_for_mime_type(mime_type)
|
parser_class = get_parser_class_for_mime_type(mime_type)
|
||||||
if not parser_class:
|
if not parser_class:
|
||||||
raise ConsumerError(f"No parsers available for {self.filename}")
|
raise ConsumerError(
|
||||||
|
f"Unsupported mime type {mime_type} of file {self.filename}")
|
||||||
else:
|
else:
|
||||||
self.log("debug",
|
self.log("debug",
|
||||||
f"Parser: {parser_class.__name__}")
|
f"Parser: {parser_class.__name__}")
|
||||||
|
|||||||
@ -98,12 +98,14 @@ class DocumentFilterSet(FilterSet):
|
|||||||
"added": DATE_KWARGS,
|
"added": DATE_KWARGS,
|
||||||
"modified": DATE_KWARGS,
|
"modified": DATE_KWARGS,
|
||||||
|
|
||||||
|
"correspondent": ["isnull"],
|
||||||
"correspondent__id": ID_KWARGS,
|
"correspondent__id": ID_KWARGS,
|
||||||
"correspondent__name": CHAR_KWARGS,
|
"correspondent__name": CHAR_KWARGS,
|
||||||
|
|
||||||
"tags__id": ID_KWARGS,
|
"tags__id": ID_KWARGS,
|
||||||
"tags__name": CHAR_KWARGS,
|
"tags__name": CHAR_KWARGS,
|
||||||
|
|
||||||
|
"document_type": ["isnull"],
|
||||||
"document_type__id": ID_KWARGS,
|
"document_type__id": ID_KWARGS,
|
||||||
"document_type__name": CHAR_KWARGS,
|
"document_type__name": CHAR_KWARGS,
|
||||||
|
|
||||||
|
|||||||
@ -87,11 +87,6 @@ def open_index(recreate=False):
|
|||||||
|
|
||||||
|
|
||||||
def update_document(writer, doc):
|
def update_document(writer, doc):
|
||||||
# TODO: this line caused many issues all around, since:
|
|
||||||
# We need to make sure that this method does not get called with
|
|
||||||
# deserialized documents (i.e, document objects that don't come from
|
|
||||||
# Django's ORM interfaces directly.
|
|
||||||
logger.debug("Indexing {}...".format(doc))
|
|
||||||
tags = ",".join([t.name for t in doc.tags.all()])
|
tags = ",".join([t.name for t in doc.tags.all()])
|
||||||
writer.update_document(
|
writer.update_document(
|
||||||
id=doc.pk,
|
id=doc.pk,
|
||||||
@ -107,9 +102,11 @@ def update_document(writer, doc):
|
|||||||
|
|
||||||
|
|
||||||
def remove_document(writer, doc):
|
def remove_document(writer, doc):
|
||||||
# TODO: see above.
|
remove_document_by_id(writer, doc.pk)
|
||||||
logger.debug("Removing {} from index...".format(doc))
|
|
||||||
writer.delete_by_term('id', doc.pk)
|
|
||||||
|
def remove_document_by_id(writer, doc_id):
|
||||||
|
writer.delete_by_term('id', doc_id)
|
||||||
|
|
||||||
|
|
||||||
def add_or_update_document(document):
|
def add_or_update_document(document):
|
||||||
|
|||||||
@ -217,6 +217,7 @@ class BulkEditSerializer(serializers.Serializer):
|
|||||||
"set_document_type",
|
"set_document_type",
|
||||||
"add_tag",
|
"add_tag",
|
||||||
"remove_tag",
|
"remove_tag",
|
||||||
|
"modify_tags",
|
||||||
"delete"
|
"delete"
|
||||||
],
|
],
|
||||||
label="Method",
|
label="Method",
|
||||||
@ -225,11 +226,31 @@ class BulkEditSerializer(serializers.Serializer):
|
|||||||
|
|
||||||
parameters = serializers.DictField(allow_empty=True)
|
parameters = serializers.DictField(allow_empty=True)
|
||||||
|
|
||||||
def validate_documents(self, documents):
|
def _validate_document_id_list(self, documents, name="documents"):
|
||||||
|
if not type(documents) == list:
|
||||||
|
raise serializers.ValidationError(f"{name} must be a list")
|
||||||
|
if not all([type(i) == int for i in documents]):
|
||||||
|
raise serializers.ValidationError(
|
||||||
|
f"{name} must be a list of integers")
|
||||||
count = Document.objects.filter(id__in=documents).count()
|
count = Document.objects.filter(id__in=documents).count()
|
||||||
if not count == len(documents):
|
if not count == len(documents):
|
||||||
raise serializers.ValidationError(
|
raise serializers.ValidationError(
|
||||||
"Some documents don't exist or were specified twice.")
|
f"Some documents in {name} don't exist or were "
|
||||||
|
f"specified twice.")
|
||||||
|
|
||||||
|
def _validate_tag_id_list(self, tags, name="tags"):
|
||||||
|
if not type(tags) == list:
|
||||||
|
raise serializers.ValidationError(f"{name} must be a list")
|
||||||
|
if not all([type(i) == int for i in tags]):
|
||||||
|
raise serializers.ValidationError(
|
||||||
|
f"{name} must be a list of integers")
|
||||||
|
count = Tag.objects.filter(id__in=tags).count()
|
||||||
|
if not count == len(tags):
|
||||||
|
raise serializers.ValidationError(
|
||||||
|
f"Some tags in {name} don't exist or were specified twice.")
|
||||||
|
|
||||||
|
def validate_documents(self, documents):
|
||||||
|
self._validate_document_id_list(documents)
|
||||||
return documents
|
return documents
|
||||||
|
|
||||||
def validate_method(self, method):
|
def validate_method(self, method):
|
||||||
@ -241,6 +262,8 @@ class BulkEditSerializer(serializers.Serializer):
|
|||||||
return bulk_edit.add_tag
|
return bulk_edit.add_tag
|
||||||
elif method == "remove_tag":
|
elif method == "remove_tag":
|
||||||
return bulk_edit.remove_tag
|
return bulk_edit.remove_tag
|
||||||
|
elif method == "modify_tags":
|
||||||
|
return bulk_edit.modify_tags
|
||||||
elif method == "delete":
|
elif method == "delete":
|
||||||
return bulk_edit.delete
|
return bulk_edit.delete
|
||||||
else:
|
else:
|
||||||
@ -283,6 +306,18 @@ class BulkEditSerializer(serializers.Serializer):
|
|||||||
else:
|
else:
|
||||||
raise serializers.ValidationError("correspondent not specified")
|
raise serializers.ValidationError("correspondent not specified")
|
||||||
|
|
||||||
|
def _validate_parameters_modify_tags(self, parameters):
|
||||||
|
if "add_tags" in parameters:
|
||||||
|
self._validate_tag_id_list(parameters['add_tags'], "add_tags")
|
||||||
|
else:
|
||||||
|
raise serializers.ValidationError("add_tags not specified")
|
||||||
|
|
||||||
|
if "remove_tags" in parameters:
|
||||||
|
self._validate_tag_id_list(parameters['remove_tags'],
|
||||||
|
"remove_tags")
|
||||||
|
else:
|
||||||
|
raise serializers.ValidationError("remove_tags not specified")
|
||||||
|
|
||||||
def validate(self, attrs):
|
def validate(self, attrs):
|
||||||
|
|
||||||
method = attrs['method']
|
method = attrs['method']
|
||||||
@ -294,6 +329,8 @@ class BulkEditSerializer(serializers.Serializer):
|
|||||||
self._validate_parameters_document_type(parameters)
|
self._validate_parameters_document_type(parameters)
|
||||||
elif method == bulk_edit.add_tag or method == bulk_edit.remove_tag:
|
elif method == bulk_edit.add_tag or method == bulk_edit.remove_tag:
|
||||||
self._validate_parameters_tags(parameters)
|
self._validate_parameters_tags(parameters)
|
||||||
|
elif method == bulk_edit.modify_tags:
|
||||||
|
self._validate_parameters_modify_tags(parameters)
|
||||||
|
|
||||||
return attrs
|
return attrs
|
||||||
|
|
||||||
@ -369,3 +406,11 @@ class PostDocumentSerializer(serializers.Serializer):
|
|||||||
return [tag.id for tag in tags]
|
return [tag.id for tag in tags]
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
class SelectionDataSerializer(serializers.Serializer):
|
||||||
|
|
||||||
|
documents = serializers.ListField(
|
||||||
|
required=True,
|
||||||
|
child=serializers.IntegerField()
|
||||||
|
)
|
||||||
|
|||||||
@ -90,7 +90,11 @@ def sanity_check():
|
|||||||
return "No issues detected."
|
return "No issues detected."
|
||||||
|
|
||||||
|
|
||||||
def bulk_rename_files(document_ids):
|
def bulk_update_documents(document_ids):
|
||||||
qs = Document.objects.filter(id__in=document_ids)
|
documents = Document.objects.filter(id__in=document_ids)
|
||||||
for doc in qs:
|
|
||||||
post_save.send(Document, instance=doc, created=False)
|
ix = index.open_index()
|
||||||
|
with AsyncWriter(ix) as writer:
|
||||||
|
for doc in documents:
|
||||||
|
index.update_document(writer, doc)
|
||||||
|
post_save.send(Document, instance=doc, created=False)
|
||||||
|
|||||||
@ -743,6 +743,20 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
|
|||||||
args, kwargs = self.async_task.call_args
|
args, kwargs = self.async_task.call_args
|
||||||
self.assertCountEqual(kwargs['document_ids'], [self.doc4.id])
|
self.assertCountEqual(kwargs['document_ids'], [self.doc4.id])
|
||||||
|
|
||||||
|
def test_modify_tags(self):
|
||||||
|
tag_unrelated = Tag.objects.create(name="unrelated")
|
||||||
|
self.doc2.tags.add(tag_unrelated)
|
||||||
|
self.doc3.tags.add(tag_unrelated)
|
||||||
|
bulk_edit.modify_tags([self.doc2.id, self.doc3.id], add_tags=[self.t2.id], remove_tags=[self.t1.id])
|
||||||
|
|
||||||
|
self.assertCountEqual(list(self.doc2.tags.all()), [self.t2, tag_unrelated])
|
||||||
|
self.assertCountEqual(list(self.doc3.tags.all()), [self.t2, tag_unrelated])
|
||||||
|
|
||||||
|
self.async_task.assert_called_once()
|
||||||
|
args, kwargs = self.async_task.call_args
|
||||||
|
# TODO: doc3 should not be affected, but the query for that is rather complicated
|
||||||
|
self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id])
|
||||||
|
|
||||||
def test_delete(self):
|
def test_delete(self):
|
||||||
self.assertEqual(Document.objects.count(), 5)
|
self.assertEqual(Document.objects.count(), 5)
|
||||||
bulk_edit.delete([self.doc1.id, self.doc2.id])
|
bulk_edit.delete([self.doc1.id, self.doc2.id])
|
||||||
|
|||||||
@ -350,7 +350,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
|
|||||||
try:
|
try:
|
||||||
self.consumer.try_consume_file(self.get_test_file())
|
self.consumer.try_consume_file(self.get_test_file())
|
||||||
except ConsumerError as e:
|
except ConsumerError as e:
|
||||||
self.assertTrue("No parsers abvailable for" in str(e))
|
self.assertEqual("Unsupported mime type application/pdf of file sample.pdf", str(e))
|
||||||
return
|
return
|
||||||
|
|
||||||
self.fail("Should throw exception")
|
self.fail("Should throw exception")
|
||||||
|
|||||||
@ -4,7 +4,8 @@ from datetime import datetime
|
|||||||
from time import mktime
|
from time import mktime
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db.models import Count, Max
|
from django.db.models import Count, Max, Case, When, IntegerField
|
||||||
|
from django.db.models.functions import Lower
|
||||||
from django.http import HttpResponse, HttpResponseBadRequest, Http404
|
from django.http import HttpResponse, HttpResponseBadRequest, Http404
|
||||||
from django.views.decorators.cache import cache_control
|
from django.views.decorators.cache import cache_control
|
||||||
from django.views.generic import TemplateView
|
from django.views.generic import TemplateView
|
||||||
@ -48,7 +49,7 @@ from .serialisers import (
|
|||||||
DocumentTypeSerializer,
|
DocumentTypeSerializer,
|
||||||
PostDocumentSerializer,
|
PostDocumentSerializer,
|
||||||
SavedViewSerializer,
|
SavedViewSerializer,
|
||||||
BulkEditSerializer
|
BulkEditSerializer, SelectionDataSerializer
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -68,7 +69,7 @@ class CorrespondentViewSet(ModelViewSet):
|
|||||||
|
|
||||||
queryset = Correspondent.objects.annotate(
|
queryset = Correspondent.objects.annotate(
|
||||||
document_count=Count('documents'),
|
document_count=Count('documents'),
|
||||||
last_correspondence=Max('documents__created')).order_by('name')
|
last_correspondence=Max('documents__created')).order_by(Lower('name'))
|
||||||
|
|
||||||
serializer_class = CorrespondentSerializer
|
serializer_class = CorrespondentSerializer
|
||||||
pagination_class = StandardPagination
|
pagination_class = StandardPagination
|
||||||
@ -87,7 +88,7 @@ class TagViewSet(ModelViewSet):
|
|||||||
model = Tag
|
model = Tag
|
||||||
|
|
||||||
queryset = Tag.objects.annotate(
|
queryset = Tag.objects.annotate(
|
||||||
document_count=Count('documents')).order_by('name')
|
document_count=Count('documents')).order_by(Lower('name'))
|
||||||
|
|
||||||
serializer_class = TagSerializer
|
serializer_class = TagSerializer
|
||||||
pagination_class = StandardPagination
|
pagination_class = StandardPagination
|
||||||
@ -101,7 +102,7 @@ class DocumentTypeViewSet(ModelViewSet):
|
|||||||
model = DocumentType
|
model = DocumentType
|
||||||
|
|
||||||
queryset = DocumentType.objects.annotate(
|
queryset = DocumentType.objects.annotate(
|
||||||
document_count=Count('documents')).order_by('name')
|
document_count=Count('documents')).order_by(Lower('name'))
|
||||||
|
|
||||||
serializer_class = DocumentTypeSerializer
|
serializer_class = DocumentTypeSerializer
|
||||||
pagination_class = StandardPagination
|
pagination_class = StandardPagination
|
||||||
@ -372,6 +373,63 @@ class PostDocumentView(APIView):
|
|||||||
return Response("OK")
|
return Response("OK")
|
||||||
|
|
||||||
|
|
||||||
|
class SelectionDataView(APIView):
|
||||||
|
|
||||||
|
permission_classes = (IsAuthenticated,)
|
||||||
|
serializer_class = SelectionDataSerializer
|
||||||
|
parser_classes = (parsers.MultiPartParser, parsers.JSONParser)
|
||||||
|
|
||||||
|
def get_serializer_context(self):
|
||||||
|
return {
|
||||||
|
'request': self.request,
|
||||||
|
'format': self.format_kwarg,
|
||||||
|
'view': self
|
||||||
|
}
|
||||||
|
|
||||||
|
def get_serializer(self, *args, **kwargs):
|
||||||
|
kwargs['context'] = self.get_serializer_context()
|
||||||
|
return self.serializer_class(*args, **kwargs)
|
||||||
|
|
||||||
|
def post(self, request, format=None):
|
||||||
|
serializer = self.get_serializer(data=request.data)
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
|
||||||
|
ids = serializer.validated_data.get('documents')
|
||||||
|
|
||||||
|
correspondents = Correspondent.objects.annotate(
|
||||||
|
document_count=Count(Case(
|
||||||
|
When(documents__id__in=ids, then=1),
|
||||||
|
output_field=IntegerField()
|
||||||
|
)))
|
||||||
|
|
||||||
|
tags = Tag.objects.annotate(document_count=Count(Case(
|
||||||
|
When(documents__id__in=ids, then=1),
|
||||||
|
output_field=IntegerField()
|
||||||
|
)))
|
||||||
|
|
||||||
|
types = DocumentType.objects.annotate(document_count=Count(Case(
|
||||||
|
When(documents__id__in=ids, then=1),
|
||||||
|
output_field=IntegerField()
|
||||||
|
)))
|
||||||
|
|
||||||
|
r = Response({
|
||||||
|
"selected_correspondents": [{
|
||||||
|
"id": t.id,
|
||||||
|
"document_count": t.document_count
|
||||||
|
} for t in correspondents],
|
||||||
|
"selected_tags": [{
|
||||||
|
"id": t.id,
|
||||||
|
"document_count": t.document_count
|
||||||
|
} for t in tags],
|
||||||
|
"selected_document_types": [{
|
||||||
|
"id": t.id,
|
||||||
|
"document_count": t.document_count
|
||||||
|
} for t in types]
|
||||||
|
})
|
||||||
|
|
||||||
|
return r
|
||||||
|
|
||||||
|
|
||||||
class SearchView(APIView):
|
class SearchView(APIView):
|
||||||
|
|
||||||
permission_classes = (IsAuthenticated,)
|
permission_classes = (IsAuthenticated,)
|
||||||
|
|||||||
@ -19,7 +19,8 @@ from documents.views import (
|
|||||||
StatisticsView,
|
StatisticsView,
|
||||||
PostDocumentView,
|
PostDocumentView,
|
||||||
SavedViewViewSet,
|
SavedViewViewSet,
|
||||||
BulkEditView
|
BulkEditView,
|
||||||
|
SelectionDataView
|
||||||
)
|
)
|
||||||
from paperless.views import FaviconView
|
from paperless.views import FaviconView
|
||||||
|
|
||||||
@ -53,10 +54,12 @@ urlpatterns = [
|
|||||||
re_path(r"^documents/post_document/", PostDocumentView.as_view(),
|
re_path(r"^documents/post_document/", PostDocumentView.as_view(),
|
||||||
name="post_document"),
|
name="post_document"),
|
||||||
|
|
||||||
|
|
||||||
re_path(r"^documents/bulk_edit/", BulkEditView.as_view(),
|
re_path(r"^documents/bulk_edit/", BulkEditView.as_view(),
|
||||||
name="bulk_edit"),
|
name="bulk_edit"),
|
||||||
|
|
||||||
|
re_path(r"^documents/selection_data/", SelectionDataView.as_view(),
|
||||||
|
name="selection_data"),
|
||||||
|
|
||||||
path('token/', views.obtain_auth_token)
|
path('token/', views.obtain_auth_token)
|
||||||
|
|
||||||
] + api_router.urls)),
|
] + api_router.urls)),
|
||||||
|
|||||||
@ -3,9 +3,9 @@ import tempfile
|
|||||||
from datetime import timedelta, date
|
from datetime import timedelta, date
|
||||||
|
|
||||||
import magic
|
import magic
|
||||||
|
import pathvalidate
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db import DatabaseError
|
from django.db import DatabaseError
|
||||||
from django.utils.text import slugify
|
|
||||||
from django_q.tasks import async_task
|
from django_q.tasks import async_task
|
||||||
from imap_tools import MailBox, MailBoxUnencrypted, AND, MailMessageFlags, \
|
from imap_tools import MailBox, MailBoxUnencrypted, AND, MailMessageFlags, \
|
||||||
MailboxFolderSelectError
|
MailboxFolderSelectError
|
||||||
@ -294,7 +294,7 @@ class MailAccountHandler(LoggingMixin):
|
|||||||
async_task(
|
async_task(
|
||||||
"documents.tasks.consume_file",
|
"documents.tasks.consume_file",
|
||||||
path=temp_filename,
|
path=temp_filename,
|
||||||
override_filename=att.filename,
|
override_filename=pathvalidate.sanitize_filename(att.filename), # NOQA: E501
|
||||||
override_title=title,
|
override_title=title,
|
||||||
override_correspondent_id=correspondent.id if correspondent else None, # NOQA: E501
|
override_correspondent_id=correspondent.id if correspondent else None, # NOQA: E501
|
||||||
override_document_type_id=doc_type.id if doc_type else None, # NOQA: E501
|
override_document_type_id=doc_type.id if doc_type else None, # NOQA: E501
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user