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

code cleanup

Browse Source
This commit is contained in:
Michael Shamoon
2022-03-11 00:48:06 -08:00
parent ad87c3c87d
commit 0826e0f96b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import { SettingsService } from "../services/settings.service"
@Injectable() @Injectable()
export class LocalizedDateParserFormatter extends NgbDateParserFormatter { export class LocalizedDateParserFormatter extends NgbDateParserFormatter {
private separatorRegExp: RegExp = /[\.,\/-]+/
constructor(private settings: SettingsService) { constructor(private settings: SettingsService) {
super() super()
@@ -35,17 +36,17 @@ export class LocalizedDateParserFormatter extends NgbDateParserFormatter {
* have it expanded to 10.03.2022, in the case of the German format. * have it expanded to 10.03.2022, in the case of the German format.
* (All other formats are also supported) * (All other formats are also supported)
* *
* It also strips any separators before running formatting, * It also strips any separators before running formatting and pads
* any parts of the string, e.g. allowing for 1/2/22,
* which allows quick entry of the date on the numpad. * which allows quick entry of the date on the numpad.
*/ */
public 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)
if ([',','.','/','-'].some(sep => value.includes(sep))) { if (this.separatorRegExp.test(value)) {
let valArr = value.split(/[\.,\/-]+/) // split on separator, pad & re-join without separator
valArr = valArr.map(segment => segment.padStart(2,'0')) value = value.split(this.separatorRegExp).map(segment => segment.padStart(2,'0')).join('')
value = valArr.join('')
} }
if (value.length == 4 && inputFormat.substring(0, 4) != 'yyyy') { if (value.length == 4 && inputFormat.substring(0, 4) != 'yyyy') {