paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3471 from paperless-ngx/fix/issue-773

Browse Source 
Feature: Add explanations to relative dates
This commit is contained in:
shamoon 2023-05-30 07:47:28 -07:00 committed by GitHub
commit f16a1101e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src-ui/messages.xlf
View File

@ -741,11 +741,11 @@
</context-group> </context-group>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
<context context-type="linenumber">24</context> <context context-type="linenumber">33</context>
</context-group> </context-group>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
<context context-type="linenumber">47</context> <context context-type="linenumber">56</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="5000042972069710005" datatype="html"> <trans-unit id="5000042972069710005" datatype="html">
@ -789,18 +789,25 @@
<context context-type="linenumber">440</context> <context context-type="linenumber">440</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="6052766076365105714" datatype="html">
<source>now</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
<context context-type="linenumber">20</context>
</context-group>
</trans-unit>
<trans-unit id="6371576811194810854" datatype="html"> <trans-unit id="6371576811194810854" datatype="html">
<source>After</source> <source>After</source>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
<context context-type="linenumber">19</context> <context context-type="linenumber">28</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="1218334388194408974" datatype="html"> <trans-unit id="1218334388194408974" datatype="html">
<source>Before</source> <source>Before</source>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context>
<context context-type="linenumber">42</context> <context context-type="linenumber">51</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="4873149362496451858" datatype="html"> <trans-unit id="4873149362496451858" datatype="html">
@ -814,21 +821,21 @@
<source>Last month</source> <source>Last month</source>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
<context context-type="linenumber">47</context> <context context-type="linenumber">48</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="8697368973702409683" datatype="html"> <trans-unit id="8697368973702409683" datatype="html">
<source>Last 3 months</source> <source>Last 3 months</source>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
<context context-type="linenumber">51</context> <context context-type="linenumber">53</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="3566342898065860218" datatype="html"> <trans-unit id="3566342898065860218" datatype="html">
<source>Last year</source> <source>Last year</source>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.ts</context>
<context context-type="linenumber">55</context> <context context-type="linenumber">58</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="8953033926734869941" datatype="html"> <trans-unit id="8953033926734869941" datatype="html">

17
src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html
View File

@ -5,13 +5,22 @@
</button> </button>
<div class="dropdown-menu date-dropdown 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 rd of relativeDates" class="list-group-item small list-goup list-group-item-action d-flex p-2" role="menuitem" (click)="setRelativeDate(rd.date)"> <button *ngFor="let rd of relativeDates" class="list-group-item small list-goup list-group-item-action d-flex p-2" role="menuitem" (click)="setRelativeDate(rd.id)">
<div class="selected-icon me-1"> <div class="selected-icon">
<svg *ngIf="relativeDate === rd.date" fill="currentColor" class="buttonicon-sm"> <svg *ngIf="relativeDate === rd.id" fill="currentColor" class="buttonicon-sm">
<use xlink:href="assets/bootstrap-icons.svg#check"/> <use xlink:href="assets/bootstrap-icons.svg#check"/>
</svg> </svg>
</div> </div>
{{rd.name}} <div class="d-flex justify-content-between w-100 align-items-center ps-2">
<div class="pe-2 pe-lg-4">
{{rd.name}}
</div>
<div class="text-muted small pe-2">
<span class="small">
{{ rd.date | customDate:'mediumDate' }} &ndash; <ng-container i18n>now</ng-container>
</span>
</div>
</div>
</button> </button>
<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">

2
src-ui/src/app/components/common/date-dropdown/date-dropdown.component.scss
View File

@ -1,5 +1,5 @@
.date-dropdown { .date-dropdown {
min-width: 250px; white-space: nowrap;
.btn-link { .btn-link {
line-height: 1; line-height: 1;

12
src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts
View File

@ -39,20 +39,24 @@ export class DateDropdownComponent implements OnInit, OnDestroy {
relativeDates = [ relativeDates = [
{ {
date: RelativeDate.LAST_7_DAYS, id: RelativeDate.LAST_7_DAYS,
name: $localize`Last 7 days`, name: $localize`Last 7 days`,
date: new Date().setDate(new Date().getDate() - 7),
}, },
{ {
date: RelativeDate.LAST_MONTH, id: RelativeDate.LAST_MONTH,
name: $localize`Last month`, name: $localize`Last month`,
date: new Date().setMonth(new Date().getMonth() - 1),
}, },
{ {
date: RelativeDate.LAST_3_MONTHS, id: RelativeDate.LAST_3_MONTHS,
name: $localize`Last 3 months`, name: $localize`Last 3 months`,
date: new Date().setMonth(new Date().getMonth() - 3),
}, },
{ {
date: RelativeDate.LAST_YEAR, id: RelativeDate.LAST_YEAR,
name: $localize`Last year`, name: $localize`Last year`,
date: new Date().setFullYear(new Date().getFullYear() - 1),
}, },
] ]