Merge pull request #842 from Bart1909/master

Implements #807
2025-07-28 18:24:38 -05:00 · 2021-04-02 14:08:01 +02:00
parent a16643ee29 b783e0e211
commit 1e101fb3db
10 changed files with 216 additions and 130 deletions
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -2,48 +2,6 @@
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
  <file source-language="en-US" datatype="plaintext" original="ng2.template">
    <body>
-      <trans-unit id="9103526311244275943" datatype="html">
-        <source>Document added</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">51</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="9204248378636247318" datatype="html">
-        <source>Document <x id="PH" equiv-text="status.filename"/> was added to paperless.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">51</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="1931214133925051574" datatype="html">
-        <source>Open document</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">51</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="8582620835547864448" datatype="html">
-        <source>Could not add <x id="PH" equiv-text="status.filename"/>: <x id="PH_1" equiv-text="status.message"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">59</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="1710712016675379662" datatype="html">
-        <source>New document detected</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="587031278561344416" datatype="html">
-        <source>Document <x id="PH" equiv-text="status.filename"/> is being processed by paperless.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
      <trans-unit id="4733307402565258070" datatype="html">
        <source>Documents</source>
        <context-group purpose="location">
@@ -394,6 +352,48 @@
          <context context-type="linenumber">131</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="9103526311244275943" datatype="html">
+        <source>Document added</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9204248378636247318" datatype="html">
+        <source>Document <x id="PH" equiv-text="status.filename"/> was added to paperless.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1931214133925051574" datatype="html">
+        <source>Open document</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8582620835547864448" datatype="html">
+        <source>Could not add <x id="PH" equiv-text="status.filename"/>: <x id="PH_1" equiv-text="status.message"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1710712016675379662" datatype="html">
+        <source>New document detected</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="587031278561344416" datatype="html">
+        <source>Document <x id="PH" equiv-text="status.filename"/> is being processed by paperless.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/app.component.ts</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="8765497970646365998" datatype="html">
        <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ng!</source>
        <context-group purpose="location">
@@ -1626,6 +1626,13 @@
          <context context-type="linenumber">14</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="bd5ca454e336126f3eeb67417d9264696b5c852c" datatype="html">
+        <source>Searching document with asn <x id="INTERPOLATION" equiv-text="{{asn}}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-asn/document-asn.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="2807800733729323332" datatype="html">
        <source>Yes</source>
        <context-group purpose="location">
@@ -1731,6 +1738,41 @@
          <context context-type="linenumber">106</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="2691296884221415710" datatype="html">
+        <source>Correspondent</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5066119607229701477" datatype="html">
+        <source>Document type</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4207916966377787111" datatype="html">
+        <source>Created</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="231679111972850796" datatype="html">
+        <source>Added</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3553216189604488439" datatype="html">
+        <source>Modified</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="2119857572761283468" datatype="html">
        <source>Document already exists.</source>
        <context-group purpose="location">
@@ -1840,41 +1882,6 @@
          <context context-type="linenumber">39</context>
        </context-group>
      </trans-unit>
-      <trans-unit id="2691296884221415710" datatype="html">
-        <source>Correspondent</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="5066119607229701477" datatype="html">
-        <source>Document type</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">20</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="4207916966377787111" datatype="html">
-        <source>Created</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="231679111972850796" datatype="html">
-        <source>Added</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">22</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="3553216189604488439" datatype="html">
-        <source>Modified</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">23</context>
-        </context-group>
-      </trans-unit>
      <trans-unit id="4561076822163447092" datatype="html">
        <source>Create new item</source>
        <context-group purpose="location">
--- a/src-ui/src/app/app-routing.module.ts
+++ b/src-ui/src/app/app-routing.module.ts
@@ -11,6 +11,7 @@ import { SettingsComponent } from './components/manage/settings/settings.compone
 import { TagListComponent } from './components/manage/tag-list/tag-list.component';
 import { NotFoundComponent } from './components/not-found/not-found.component';
 import { SearchComponent } from './components/search/search.component';
+import {DocumentAsnComponent} from "./components/document-asn/document-asn.component";

 const routes: Routes = [
  {path: '', redirectTo: 'dashboard', pathMatch: 'full'},
@@ -20,13 +21,14 @@ const routes: Routes = [
    {path: 'view/:id', component: DocumentListComponent },
    {path: 'search', component: SearchComponent },
    {path: 'documents/:id', component: DocumentDetailComponent },
-  
+      {path: 'asn/:id', component: DocumentAsnComponent },
+
    {path: 'tags', component: TagListComponent },
    {path: 'documenttypes', component: DocumentTypeListComponent },
    {path: 'correspondents', component: CorrespondentListComponent },
    {path: 'logs', component: LogsComponent },
    {path: 'settings', component: SettingsComponent },
-  ]}, 
+  ]},

  {path: '404', component: NotFoundComponent},
  {path: '**', redirectTo: '/404', pathMatch: 'full'}
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -75,6 +75,7 @@ import localeEnGb from '@angular/common/locales/en-GB';
 import localeRo from '@angular/common/locales/ro';
 import localeRu from '@angular/common/locales/ru';
 import localeEs from '@angular/common/locales/es';
+import { DocumentAsnComponent } from './components/document-asn/document-asn.component';


 registerLocaleData(localeFr)
@@ -138,7 +139,8 @@ registerLocaleData(localeEs)
    SafePipe,
    CustomDatePipe,
    DateComponent,
-    ColorComponent
+    ColorComponent,
+    DocumentAsnComponent
  ],
  imports: [
    BrowserModule,
--- a/src-ui/src/app/components/document-asn/document-asn.component.html
+++ b/src-ui/src/app/components/document-asn/document-asn.component.html
@@ -0,0 +1 @@
+<p i18n>Searching document with asn {{asn}}</p>
--- a/src-ui/src/app/components/document-asn/document-asn.component.scss
+++ b/src-ui/src/app/components/document-asn/document-asn.component.scss
--- a/src-ui/src/app/components/document-asn/document-asn.component.spec.ts
+++ b/src-ui/src/app/components/document-asn/document-asn.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DocumentAsnComponent } from './document-asn.component';
+
+describe('DocumentASNComponentComponent', () => {
+  let component: DocumentAsnComponent;
+  let fixture: ComponentFixture<DocumentAsnComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ DocumentAsnComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DocumentAsnComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src-ui/src/app/components/document-asn/document-asn.component.ts
+++ b/src-ui/src/app/components/document-asn/document-asn.component.ts
@@ -0,0 +1,34 @@
+import { Component, OnInit } from '@angular/core';
+import {DocumentService} from "../../services/rest/document.service";
+import {ActivatedRoute, Router} from "@angular/router";
+import {FILTER_ASN} from "../../data/filter-rule-type";
+
+@Component({
+  selector: 'app-document-asncomponent',
+  templateUrl: './document-asn.component.html',
+  styleUrls: ['./document-asn.component.scss']
+})
+export class DocumentAsnComponent implements OnInit {
+
+  asn: string
+  constructor(
+    private documentsService: DocumentService,
+    private route: ActivatedRoute,
+    private router: Router) { }
+
+
+  ngOnInit(): void {
+
+    this.route.paramMap.subscribe(paramMap => {
+      this.asn = paramMap.get('id');
+      this.documentsService.listAllFilteredIds([{rule_type: FILTER_ASN, value: this.asn}]).subscribe(documentId => {
+        if (documentId.length == 1) {
+          this.router.navigate(['documents', documentId[0]])
+        } else {
+          this.router.navigate(['404'])
+        }
+      })
+    })
+
+  }
+}
				`@@ -0,0 +1 @@`
				`<p i18n>Searching document with asn {{asn}}</p>`