diff --git a/docs/api.rst b/docs/api.rst index c23866b60..1e70b19fa 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -31,7 +31,8 @@ The objects served by the document endpoint contain the following fields: * ``tags``: List of IDs of tags assigned to this document, or empty list. * ``document_type``: Document type of this document, or null. * ``correspondent``: Correspondent of this document or null. -* ``created``: The date at which this document was created. +* ``created``: The date time at which this document was created. +* ``created_date``: The date (YYYY-MM-DD) at which this document was created. Optional. If also passed with created, this is ignored. * ``modified``: The date at which this document was last edited in paperless. Read-only. * ``added``: The date at which this document was added to paperless. Read-only. * ``archive_serial_number``: The identifier of this document in a physical document archive. diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 9701aeb18..7b5e16da0 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -61,7 +61,7 @@ import { SafeUrlPipe } from './pipes/safeurl.pipe' import { SafeHtmlPipe } from './pipes/safehtml.pipe' import { CustomDatePipe } from './pipes/custom-date.pipe' import { DateComponent } from './components/common/input/date/date.component' -import { ISODateTimeAdapter } from './utils/ngb-iso-date-time-adapter' +import { ISODateAdapter } from './utils/ngb-iso-date-adapter' import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter' import { ApiVersionInterceptor } from './interceptors/api-version.interceptor' import { ColorSliderModule } from 'ngx-color/slider' @@ -205,7 +205,7 @@ function initializeApp(settings: SettingsService) { }, FilterPipe, DocumentTitlePipe, - { provide: NgbDateAdapter, useClass: ISODateTimeAdapter }, + { provide: NgbDateAdapter, useClass: ISODateAdapter }, { provide: NgbDateParserFormatter, useClass: LocalizedDateParserFormatter }, ], bootstrap: [AppComponent], diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index 50d064c37..84ee1aabe 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -12,7 +12,7 @@ - {{doc.created | customDate}} + {{doc.created_date | customDate}} {{doc.title | documentTitle}} diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 0f355eb06..7948d82e3 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -68,7 +68,7 @@ - + { + .subscribe(() => { this.error = null - if (this.ogDate) { - try { - let newDate = new Date(normalizeDateStr(changes['created'])) - newDate.setHours( - this.ogDate.getHours(), - this.ogDate.getMinutes(), - this.ogDate.getSeconds(), - this.ogDate.getMilliseconds() - ) - this.documentForm.patchValue( - { created: newDate.toISOString() }, - { emitEvent: false } - ) - } catch (e) { - // catch this before we try to save and simulate an api error - this.error = { created: e.message } - } - } - Object.assign(this.document, this.documentForm.value) }) @@ -231,13 +211,11 @@ export class DocumentDetailComponent }, }) - this.ogDate = new Date(normalizeDateStr(doc.created.toString())) - // Initialize dirtyCheck this.store = new BehaviorSubject({ title: doc.title, content: doc.content, - created: this.ogDate.toISOString(), + created_date: doc.created_date, correspondent: doc.correspondent, document_type: doc.document_type, storage_path: doc.storage_path, @@ -245,12 +223,6 @@ export class DocumentDetailComponent tags: [...doc.tags], }) - // start with ISO8601 string - this.documentForm.patchValue( - { created: this.ogDate.toISOString() }, - { emitEvent: false } - ) - this.isDirty$ = dirtyCheck( this.documentForm, this.store.asObservable() diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 87ed56d92..1b859f39b 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -92,7 +92,7 @@ - {{document.created | customDate:'mediumDate'}} + {{document.created_date | customDate:'mediumDate'}}
Score: diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 813447f2d..aec8d76ae 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -55,7 +55,7 @@ - {{document.created | customDate:'mediumDate'}} + {{document.created_date | customDate:'mediumDate'}}
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index b136a0456..7895c9a52 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -186,7 +186,7 @@ - {{d.created | customDate}} + {{d.created_date | customDate}} {{d.added | customDate}} diff --git a/src-ui/src/app/data/paperless-document.ts b/src-ui/src/app/data/paperless-document.ts index 779c7896c..f5f83868c 100644 --- a/src-ui/src/app/data/paperless-document.ts +++ b/src-ui/src/app/data/paperless-document.ts @@ -37,8 +37,12 @@ export interface PaperlessDocument extends ObjectWithId { checksum?: string + // UTC created?: Date + // localized date + created_date?: Date + modified?: Date added?: Date diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts index c9cfc2876..4a0bb3463 100644 --- a/src-ui/src/app/pipes/custom-date.pipe.ts +++ b/src-ui/src/app/pipes/custom-date.pipe.ts @@ -2,7 +2,6 @@ import { DatePipe } from '@angular/common' import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core' import { SETTINGS_KEYS } from '../data/paperless-uisettings' import { SettingsService } from '../services/settings.service' -import { normalizeDateStr } from '../utils/date' const FORMAT_TO_ISO_FORMAT = { longDate: 'y-MM-dd', @@ -35,7 +34,6 @@ export class CustomDatePipe implements PipeTransform { this.settings.get(SETTINGS_KEYS.DATE_LOCALE) || this.defaultLocale let f = format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT) - if (typeof value == 'string') value = normalizeDateStr(value) if (l == 'iso-8601') { return this.datePipe.transform(value, FORMAT_TO_ISO_FORMAT[f], timezone) } else { diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts index de4d184e7..8e4d8eee9 100644 --- a/src-ui/src/app/services/rest/document.service.ts +++ b/src-ui/src/app/services/rest/document.service.ts @@ -133,6 +133,12 @@ export class DocumentService extends AbstractPaperlessService return url } + update(o: PaperlessDocument): Observable { + // we want to only set created_date + o.created = undefined + return super.update(o) + } + uploadDocument(formData) { return this.http.post( this.getResourceUrl(null, 'post_document'), diff --git a/src-ui/src/app/utils/date.ts b/src-ui/src/app/utils/date.ts deleted file mode 100644 index b62ffc939..000000000 --- a/src-ui/src/app/utils/date.ts +++ /dev/null @@ -1,5 +0,0 @@ -// see https://github.com/dateutil/dateutil/issues/878 , JS Date does not -// seem to accept these strings as valid dates so we must normalize offset -export function normalizeDateStr(dateStr: string): string { - return dateStr.replace(/[\+-](\d\d):\d\d:\d\d/gm, `-$1:00`) -} diff --git a/src-ui/src/app/utils/ngb-iso-date-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-adapter.ts index 7aa2214b5..af2fff3f3 100644 --- a/src-ui/src/app/utils/ngb-iso-date-adapter.ts +++ b/src-ui/src/app/utils/ngb-iso-date-adapter.ts @@ -5,11 +5,20 @@ import { NgbDateAdapter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap' export class ISODateAdapter extends NgbDateAdapter { fromModel(value: string | null): NgbDateStruct | null { if (value) { - let date = new Date(value) - return { - day: date.getDate(), - month: date.getMonth() + 1, - year: date.getFullYear(), + if (value.match(/\d\d\d\d\-\d\d\-\d\d/g)) { + const segs = value.split('-') + return { + year: parseInt(segs[0]), + month: parseInt(segs[1]), + day: parseInt(segs[2]), + } + } else { + let date = new Date(value) + return { + day: date.getDate(), + month: date.getMonth() + 1, + year: date.getFullYear(), + } } } else { return null diff --git a/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts deleted file mode 100644 index b9acc38ec..000000000 --- a/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Injectable } from '@angular/core' -import { NgbDateAdapter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap' - -@Injectable() -export class ISODateTimeAdapter extends NgbDateAdapter { - fromModel(value: string | null): NgbDateStruct | null { - if (value) { - let date = new Date(value) - return { - day: date.getDate(), - month: date.getMonth() + 1, - year: date.getFullYear(), - } - } else { - return null - } - } - - toModel(date: NgbDateStruct | null): string | null { - return date - ? new Date(date.year, date.month - 1, date.day).toISOString() - : null - } -} diff --git a/src/documents/models.py b/src/documents/models.py index f24ce462e..dc34c17b2 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -306,6 +306,10 @@ class Document(models.Model): def thumbnail_file(self): return open(self.thumbnail_path, "rb") + @property + def created_date(self): + return timezone.localdate(self.created) + class Log(models.Model): diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index ea8c0364f..7d64a0d65 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -1,7 +1,13 @@ +import datetime import math import re +try: + import zoneinfo +except ImportError: + import backports.zoneinfo as zoneinfo import magic +from django.conf import settings from django.utils.text import slugify from django.utils.translation import gettext as _ from rest_framework import serializers @@ -214,6 +220,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer): original_file_name = SerializerMethodField() archived_file_name = SerializerMethodField() + created_date = serializers.DateField(required=False) def get_original_file_name(self, obj): return obj.get_public_filename() @@ -224,6 +231,18 @@ class DocumentSerializer(DynamicFieldsModelSerializer): else: return None + def update(self, instance, validated_data): + if "created_date" in validated_data and "created" not in validated_data: + new_datetime = datetime.datetime.combine( + validated_data.get("created_date"), + datetime.time(0, 0, 0, 0, zoneinfo.ZoneInfo(settings.TIME_ZONE)), + ) + instance.created = new_datetime + instance.save() + validated_data.pop("created_date") + super().update(instance, validated_data) + return instance + class Meta: model = Document depth = 1 @@ -236,6 +255,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer): "content", "tags", "created", + "created_date", "modified", "added", "archive_serial_number",