Merge 2ec82e8 into 5612ad0

jonaswinkler · Mar 1, 2022 · b741c8e · b741c8e
2 parents 5612ad0 + 2ec82e8
commit b741c8e
Show file tree

Hide file tree

Showing 32 changed files with 271 additions and 2 deletions.
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
@@ -64,7 +64,7 @@
                         <app-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true"
                             (createNew)="createDocumentType($event)" [suggestions]="suggestions?.document_types"></app-input-select>
                         <app-input-tags formControlName="tags" [suggestions]="suggestions?.tags"></app-input-tags>
-
+                        <app-input-date i18n-title title="Expiry date" formControlName="expired" [error]="error?.expired"></app-input-date>
                     </ng-template>
                 </li>
 

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -21,6 +21,7 @@ import { TextComponent } from '../common/input/text/text.component';
 import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
 import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-suggestions';
 import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type';
+import { expiryDateValidator } from 'src/app/directives/expiryDate.directive';
 
 @Component({
   selector: 'app-document-detail',
@@ -56,11 +57,12 @@ export class DocumentDetailComponent implements OnInit {
     title: new FormControl(''),
     content: new FormControl(''),
     created: new FormControl(),
+    expired: new FormControl(),
     correspondent: new FormControl(),
     document_type: new FormControl(),
     archive_serial_number: new FormControl(),
     tags: new FormControl([])
-  })
+  }, { validators: expiryDateValidator })
 
   previewCurrentPage: number = 1
   previewNumPages: number = 1

diff --git a/src-ui/src/app/data/paperless-document.ts b/src-ui/src/app/data/paperless-document.ts
@@ -37,6 +37,8 @@ export interface PaperlessDocument extends ObjectWithId {
 
     created?: Date
 
+    expired?: Date
+
     modified?: Date
 
     added?: Date

diff --git a/src-ui/src/app/directives/expiryDate.directive.ts b/src-ui/src/app/directives/expiryDate.directive.ts
@@ -0,0 +1,9 @@
+import { AbstractControl, ValidationErrors, ValidatorFn } from "@angular/forms";
+
+export const expiryDateValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
+    const created = control.get("created");
+    const expired = control.get("expired");
+    let expiredDate = new Date(expired.value);
+    let createdDate = new Date(created.value);
+    return createdDate >= expiredDate ? { expiredDateInvalid: true } : null;
+  };
diff --git a/src-ui/src/locale/messages.cs_CZ.xlf b/src-ui/src/locale/messages.cs_CZ.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="needs-translation">Date created</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Datum vypršení platnosti</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.de_DE.xlf b/src-ui/src/locale/messages.de_DE.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Ausgestellt am</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="translated">Verfallsdatum</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.en_GB.xlf b/src-ui/src/locale/messages.en_GB.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Date created</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="translated">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.es_ES.xlf b/src-ui/src/locale/messages.es_ES.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Fecha de creación</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Fecha de caducidad</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.fr_FR.xlf b/src-ui/src/locale/messages.fr_FR.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Date de création</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Date d'expiration</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.he_IL.xlf b/src-ui/src/locale/messages.he_IL.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="needs-translation">Date created</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.hu_HU.xlf b/src-ui/src/locale/messages.hu_HU.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Létrehozás dátuma</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.it_IT.xlf b/src-ui/src/locale/messages.it_IT.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Data creazione</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Data di scadenza</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.la_LA.xlf b/src-ui/src/locale/messages.la_LA.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="needs-translation">Date created</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.lb_LU.xlf b/src-ui/src/locale/messages.lb_LU.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Erstellungsdatum</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.nb_NO.xlf b/src-ui/src/locale/messages.nb_NO.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Dato opprettet</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Aanmaakdatum</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.no_NO.xlf b/src-ui/src/locale/messages.no_NO.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="needs-translation">Date created</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.pl_PL.xlf b/src-ui/src/locale/messages.pl_PL.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Data utworzenia</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Data de criação</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.pt_PT.xlf b/src-ui/src/locale/messages.pt_PT.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Data de criação</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.ro_RO.xlf b/src-ui/src/locale/messages.ro_RO.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Data creării</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.ru_RU.xlf b/src-ui/src/locale/messages.ru_RU.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Дата создания</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.sv_SE.xlf b/src-ui/src/locale/messages.sv_SE.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="translated">Datum skapad</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.th_TH.xlf b/src-ui/src/locale/messages.th_TH.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="needs-translation">Date created</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.xh_ZA.xlf b/src-ui/src/locale/messages.xh_ZA.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target>crwdns2926:0crwdne2926:0</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.zh_CN.xlf b/src-ui/src/locale/messages.zh_CN.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="needs-translation">Date created</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">

diff --git a/src-ui/src/locale/messages.zh_TW.xlf b/src-ui/src/locale/messages.zh_TW.xlf
@@ -362,6 +362,14 @@
         </context-group>
         <target state="needs-translation">Date created</target>
       </trans-unit>
+      <trans-unit id="5cfc9ab90d19d79c71a60644be816f1b4e974a1b" datatype="html">
+        <source>Expiry date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <target state="needs-translation">Expiry date</target>
+      </trans-unit>
       <trans-unit id="6e58f1baf7acb6a0cfe3636b9c2a61b4d1183720" datatype="html">
         <source>Date modified</source>
         <context-group purpose="location">