paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 03:56:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make date buttons same as other dropdowns

Browse Source
This commit is contained in:
Michael Shamoon
2020-12-13 14:11:43 -08:00
parent b753e5c419
commit b3b24ebe03
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
View File

@@ -9,12 +9,11 @@
</button> </button>
<div class="dropdown-menu date-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}"> <div class="dropdown-menu date-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">
<div class="list-group-item d-flex flex-column align-items-start"> <button *ngFor="let range of [7, 30, 'month', 'year']" class="list-group-item small list-goup list-group-item-action d-flex" role="menuitem" (click)="setDateQuickFilter(range)">
<button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter(7)">Last 7 days</button> <ng-container *ngIf="isStringRange(range)">This </ng-container>
<button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter(30)">Last 30 days</button> {{ range }}
<button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter('month')">This month</button> <ng-container *ngIf="!isStringRange(range)"> days</ng-container>
<button class="btn btn-sm btn-link pl-0" (click)="setDateQuickFilter('year')">This year</button> </button>
</div>
<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-1"><small>Before</small></div> <div class="mb-1"><small>Before</small></div>
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">

4
src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts
View File

@@ -36,6 +36,10 @@ export class FilterDropdownDateComponent {
return NgbDate.from({year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()}) return NgbDate.from({year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()})
} }
isStringRange(range: any) {
return typeof range == 'string'
}
ngOnChanges(changes: SimpleChange) { ngOnChanges(changes: SimpleChange) {
// this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097 // this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097
let dateString: string = '' let dateString: string = ''