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

Allow formatting non-padded dates

Browse Source
This commit is contained in:
Michael Shamoon 2022-03-10 15:11:08 -08:00
parent a33dce1948
commit 1807811903
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/src/app/components/common/input/date/date.component.html
View File

@ -1,7 +1,7 @@
<div class="mb-3"> <div class="mb-3">
<label class="form-label" [for]="inputId">{{title}}</label> <label class="form-label" [for]="inputId">{{title}}</label>
<div class="input-group" [class.is-invalid]="error"> <div class="input-group" [class.is-invalid]="error">
<input class="form-control" [class.is-invalid]="error" [placeholder]="placeholder" [id]="inputId" (dateSelect)="onChange(value)" (change)="onChange(value)" <input class="form-control" [class.is-invalid]="error" [placeholder]="placeholder" [id]="inputId" (dateSelect)="onChange(value)" (change)="onChange(value)" (focusout)="onFocusOut()"
name="dp" [(ngModel)]="value" ngbDatepicker #datePicker="ngbDatepicker" #datePickerContent="ngModel"> name="dp" [(ngModel)]="value" ngbDatepicker #datePicker="ngbDatepicker" #datePickerContent="ngModel">
<button class="btn btn-outline-secondary calendar" (click)="datePicker.toggle()" type="button"> <button class="btn btn-outline-secondary calendar" (click)="datePicker.toggle()" type="button">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-calendar" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-calendar" viewBox="0 0 16 16">

11
src-ui/src/app/components/common/input/date/date.component.ts
View File

@ -2,6 +2,7 @@ import { Component, forwardRef, Input, OnInit, ViewChild } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { NgbDateAdapter, NgbDateParserFormatter, NgbDatepickerContent } from '@ng-bootstrap/ng-bootstrap'; import { NgbDateAdapter, NgbDateParserFormatter, NgbDatepickerContent } from '@ng-bootstrap/ng-bootstrap';
import { SettingsService } from 'src/app/services/settings.service'; import { SettingsService } from 'src/app/services/settings.service';
import { LocalizedDateParserFormatter } from 'src/app/utils/ngb-date-parser-formatter';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import { AbstractInputComponent } from '../abstract-input'; import { AbstractInputComponent } from '../abstract-input';
@ -29,4 +30,14 @@ export class DateComponent extends AbstractInputComponent<string> implements OnI
placeholder: string placeholder: string
// Allow dates to be specified without 'padding' e.g. 2/3
onFocusOut() {
if (!this.value || this.value.length > 8) return; // its already been formatted
if ([',','.','/','-'].some(sep => this.value.includes(sep))) {
let valArr = this.value.split(/[\.,\/-]+/)
valArr = valArr.map(segment => segment.padStart(2,'0'))
let dateFormatter = new LocalizedDateParserFormatter(this.settings)
this.value = dateFormatter.preformatDateInput(valArr.join(''))
}
}
} }

2
src-ui/src/app/utils/ngb-date-parser-formatter.ts
View File

@ -38,7 +38,7 @@ export class LocalizedDateParserFormatter extends NgbDateParserFormatter {
* It also strips commas or periods before running formatting, * It also strips commas or periods before running formatting,
* which allows quick entry of the date on the numpad. * which allows quick entry of the date on the numpad.
*/ */
private preformatDateInput(value: string): string { public preformatDateInput(value: string): string {
let inputFormat = this.getDateInputFormat() let inputFormat = this.getDateInputFormat()
let dateSeparator = inputFormat.replace(/[dmy]/gi, '').charAt(0) let dateSeparator = inputFormat.replace(/[dmy]/gi, '').charAt(0)