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

adjustments of the front end for API changes.

Browse Source
This commit is contained in:
jonaswinkler 2020-12-03 20:28:17 +01:00
parent 68c233005e
commit 982ea84906
10 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
View File

@ -13,7 +13,7 @@
<tbody> <tbody>
<tr *ngFor="let doc of documents" routerLink="/documents/{{doc.id}}"> <tr *ngFor="let doc of documents" routerLink="/documents/{{doc.id}}">
<td>{{doc.created | date}}</td> <td>{{doc.created | date}}</td>
<td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags" class="ml-1"></app-tag> <td>{{doc.title}}<app-tag [tag]="t" *ngFor="let t of doc.tags_objects" class="ml-1"></app-tag>
</tr> </tr>
</tbody> </tbody>
</table> </table>

6
src-ui/src/app/components/document-detail/document-detail.component.html
View File

@ -53,11 +53,11 @@
<textarea class="form-control" id="content" rows="5" formControlName='content'></textarea> <textarea class="form-control" id="content" rows="5" formControlName='content'></textarea>
</div> </div>
<app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent_id" allowNull="true" (createNew)="createCorrespondent()"></app-input-select> <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent" allowNull="true" (createNew)="createCorrespondent()"></app-input-select>
<app-input-select [items]="documentTypes" title="Document type" formControlName="document_type_id" allowNull="true" (createNew)="createDocumentType()"></app-input-select> <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type" allowNull="true" (createNew)="createDocumentType()"></app-input-select>
<app-input-tags formControlName="tags_id" title="Tags"></app-input-tags> <app-input-tags formControlName="tags" title="Tags"></app-input-tags>
<button type="button" class="btn btn-outline-secondary" (click)="discard()">Discard</button>&nbsp; <button type="button" class="btn btn-outline-secondary" (click)="discard()">Discard</button>&nbsp;
<button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()">Save & edit next</button>&nbsp; <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()">Save & edit next</button>&nbsp;

10
src-ui/src/app/components/document-detail/document-detail.component.ts
View File

@ -37,10 +37,10 @@ export class DocumentDetailComponent implements OnInit {
title: new FormControl(''), title: new FormControl(''),
content: new FormControl(''), content: new FormControl(''),
created: new FormControl(), created: new FormControl(),
correspondent_id: new FormControl(), correspondent: new FormControl(),
document_type_id: new FormControl(), document_type: new FormControl(),
archive_serial_number: new FormControl(), archive_serial_number: new FormControl(),
tags_id: new FormControl([]) tags: new FormControl([])
}) })
constructor( constructor(
@ -93,7 +93,7 @@ export class DocumentDetailComponent implements OnInit {
modal.componentInstance.success.subscribe(newDocumentType => { modal.componentInstance.success.subscribe(newDocumentType => {
this.documentTypeService.listAll().subscribe(documentTypes => { this.documentTypeService.listAll().subscribe(documentTypes => {
this.documentTypes = documentTypes.results this.documentTypes = documentTypes.results
this.documentForm.get('document_type_id').setValue(newDocumentType.id) this.documentForm.get('document_type').setValue(newDocumentType.id)
}) })
}) })
} }
@ -104,7 +104,7 @@ export class DocumentDetailComponent implements OnInit {
modal.componentInstance.success.subscribe(newCorrespondent => { modal.componentInstance.success.subscribe(newCorrespondent => {
this.correspondentService.listAll().subscribe(correspondents => { this.correspondentService.listAll().subscribe(correspondents => {
this.correspondents = correspondents.results this.correspondents = correspondents.results
this.documentForm.get('correspondent_id').setValue(newCorrespondent.id) this.documentForm.get('correspondent').setValue(newCorrespondent.id)
}) })
}) })
} }

8
src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
View File

@ -8,12 +8,12 @@
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
<h5 class="card-title"> <h5 class="card-title">
<ng-container *ngIf="document.correspondent"> <ng-container *ngIf="document.correspondent_object">
<a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent.name}}</a> <a *ngIf="clickCorrespondent.observers.length ; else nolink" [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent_object.name}}</a>
<ng-template #nolink>{{document.correspondent.name}}</ng-template>: <ng-template #nolink>{{document.correspondent_object.name}}</ng-template>:
</ng-container> </ng-container>
{{document.title}} {{document.title}}
<app-tag [tag]="t" linkTitle="Filter by tag" *ngFor="let t of document.tags" class="ml-1" (click)="clickTag.emit(t)" [clickable]="clickTag.observers.length"></app-tag> <app-tag [tag]="t" linkTitle="Filter by tag" *ngFor="let t of document.tags_objects" class="ml-1" (click)="clickTag.emit(t.id)" [clickable]="clickTag.observers.length"></app-tag>
</h5> </h5>
<h5 class="card-title" *ngIf="document.archive_serial_number">#{{document.archive_serial_number}}</h5> <h5 class="card-title" *ngIf="document.archive_serial_number">#{{document.archive_serial_number}}</h5>
</div> </div>

4
src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
View File

@ -20,10 +20,10 @@ export class DocumentCardLargeComponent implements OnInit {
details: any details: any
@Output() @Output()
clickTag = new EventEmitter<PaperlessTag>() clickTag = new EventEmitter<number>()
@Output() @Output()
clickCorrespondent = new EventEmitter<PaperlessDocument>() clickCorrespondent = new EventEmitter<number>()
ngOnInit(): void { ngOnInit(): void {
} }

8
src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
View File

@ -1,15 +1,15 @@
<div class="col p-2 h-100" style="width: 16rem;"> <div class="col p-2 h-100" style="width: 16rem;">
<div class="card h-100 shadow-sm"> <div class="card h-100 shadow-sm">
<div class=" border-bottom doc-img pr-1" [ngStyle]="{'background-image': 'url(' + getThumbUrl() + ')'}"> <div class=" border-bottom doc-img pr-1" [ngStyle]="{'background-image': 'url(' + getThumbUrl() + ')'}">
<div class="row" *ngFor="let t of document.tags"> <div class="row" *ngFor="let t of document.tags_objects">
<app-tag style="font-size: large;" [tag]="t" class="col text-right" (click)="clickTag.emit(t)" [clickable]="true" linkTitle="Filter by tag"></app-tag> <app-tag style="font-size: large;" [tag]="t" class="col text-right" (click)="clickTag.emit(t.id)" [clickable]="true" linkTitle="Filter by tag"></app-tag>
</div> </div>
</div> </div>
<div class="card-body p-2"> <div class="card-body p-2">
<p class="card-text"> <p class="card-text">
<ng-container *ngIf="document.correspondent"> <ng-container *ngIf="document.correspondent_object">
<a [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent.name}}</a>: <a [routerLink]="" title="Filter by correspondent" (click)="clickCorrespondent.emit(document.correspondent)" class="font-weight-bold">{{document.correspondent_object.name}}</a>:
</ng-container> </ng-container>
{{document.title}} {{document.title}}
</p> </p>

4
src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
View File

@ -16,10 +16,10 @@ export class DocumentCardSmallComponent implements OnInit {
document: PaperlessDocument document: PaperlessDocument
@Output() @Output()
clickTag = new EventEmitter<PaperlessTag>() clickTag = new EventEmitter<number>()
@Output() @Output()
clickCorrespondent = new EventEmitter<PaperlessDocument>() clickCorrespondent = new EventEmitter<number>()
ngOnInit(): void { ngOnInit(): void {
} }

10
src-ui/src/app/components/document-list/document-list.component.html
View File

@ -100,17 +100,17 @@
{{d.archive_serial_number}} {{d.archive_serial_number}}
</td> </td>
<td class="d-none d-md-table-cell"> <td class="d-none d-md-table-cell">
<ng-container *ngIf="d.correspondent"> <ng-container *ngIf="d.correspondent_object">
<a [routerLink]="" (click)="filterByCorrespondent(d.correspondent)" title="Filter by correspondent">{{d.correspondent.name}}</a> <a [routerLink]="" (click)="filterByCorrespondent(d.correspondent)" title="Filter by correspondent">{{d.correspondent_object.name}}</a>
</ng-container> </ng-container>
</td> </td>
<td> <td>
<a routerLink="/documents/{{d.id}}" title="Edit document">{{d.title}}</a> <a routerLink="/documents/{{d.id}}" title="Edit document">{{d.title}}</a>
<app-tag [tag]="t" *ngFor="let t of d.tags" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="filterByTag(t)"></app-tag> <app-tag [tag]="t" *ngFor="let t of d.tags_objects" class="ml-1" clickable="true" linkTitle="Filter by tag" (click)="filterByTag(t.id)"></app-tag>
</td> </td>
<td class="d-none d-xl-table-cell"> <td class="d-none d-xl-table-cell">
<ng-container *ngIf="d.document_type"> <ng-container *ngIf="d.document_type_object">
<a [routerLink]="" (click)="filterByDocumentType(d.document_type)" title="Filter by document type">{{d.document_type.name}}</a> <a [routerLink]="" (click)="filterByDocumentType(d.document_type)" title="Filter by document type">{{d.document_type_object.name}}</a>
</ng-container> </ng-container>
</td> </td>
<td> <td>

22
src-ui/src/app/components/document-list/document-list.component.ts
View File

@ -95,40 +95,40 @@ export class DocumentListComponent implements OnInit {
}) })
} }
filterByTag(t: PaperlessTag) { filterByTag(tag_id: number) {
let filterRules = this.list.filterRules let filterRules = this.list.filterRules
if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == t.id)) { if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) {
return return
} }
filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: t.id}) filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id})
this.filterRules = filterRules this.filterRules = filterRules
this.applyFilterRules() this.applyFilterRules()
} }
filterByCorrespondent(c: PaperlessCorrespondent) { filterByCorrespondent(correspondent_id: number) {
let filterRules = this.list.filterRules let filterRules = this.list.filterRules
let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT) let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT)
if (existing_rule && existing_rule.value == c.id) { if (existing_rule && existing_rule.value == correspondent_id) {
return return
} else if (existing_rule) { } else if (existing_rule) {
existing_rule.value = c.id existing_rule.value = correspondent_id
} else { } else {
filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: c.id}) filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id})
} }
this.filterRules = filterRules this.filterRules = filterRules
this.applyFilterRules() this.applyFilterRules()
} }
filterByDocumentType(dt: PaperlessDocumentType) { filterByDocumentType(document_type_id: number) {
let filterRules = this.list.filterRules let filterRules = this.list.filterRules
let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE) let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE)
if (existing_rule && existing_rule.value == dt.id) { if (existing_rule && existing_rule.value == document_type_id) {
return return
} else if (existing_rule) { } else if (existing_rule) {
existing_rule.value = dt.id existing_rule.value = document_type_id
} else { } else {
filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: dt.id}) filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id})
} }
this.filterRules = filterRules this.filterRules = filterRules
this.applyFilterRules() this.applyFilterRules()

12
src-ui/src/app/data/paperless-document.ts
View File

@ -5,13 +5,13 @@ import { PaperlessDocumentType } from './paperless-document-type'
export interface PaperlessDocument extends ObjectWithId { export interface PaperlessDocument extends ObjectWithId {
correspondent?: PaperlessCorrespondent correspondent_object?: PaperlessCorrespondent
correspondent_id?: number correspondent?: number
document_type?: PaperlessDocumentType document_type_object?: PaperlessDocumentType
document_type_id?: number document_type?: number
title?: string title?: string
@ -19,9 +19,9 @@ export interface PaperlessDocument extends ObjectWithId {
file_type?: string file_type?: string
tags?: PaperlessTag[] tags_objects?: PaperlessTag[]
tags_id?: number[] tags?: number[]
checksum?: string checksum?: string