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

Fix tab ids & date parsing

Browse Source
This commit is contained in:
Michael Shamoon 2022-09-27 17:56:04 -07:00
parent 14b6216b49
commit c289439cab
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/src/app/components/manage/tasks/tasks.component.html
View File

@ -54,7 +54,7 @@
</div> </div>
</th> </th>
<td class="overflow-auto">{{ task.name }}</td> <td class="overflow-auto">{{ task.name }}</td>
<td class="d-none d-lg-table-cell">{{ task.created | customDate:'short' }}</td> <td class="d-none d-lg-table-cell">{{ task.date_created | customDate:'short' }}</td>
<td class="d-none d-lg-table-cell" *ngIf="activeTab != 'started' && activeTab != 'queued'"> <td class="d-none d-lg-table-cell" *ngIf="activeTab != 'started' && activeTab != 'queued'">
<div *ngIf="task.result.length > 50" class="result" (click)="expandTask(task); $event.stopPropagation();" <div *ngIf="task.result.length > 50" class="result" (click)="expandTask(task); $event.stopPropagation();"
[ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body"> [ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body">

10
src-ui/src/app/components/manage/tasks/tasks.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, OnDestroy } from '@angular/core' import { Component, OnInit, OnDestroy } from '@angular/core'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { takeUntil, Subject, first } from 'rxjs' import { Subject, first } from 'rxjs'
import { PaperlessTask } from 'src/app/data/paperless-task' import { PaperlessTask } from 'src/app/data/paperless-task'
import { TasksService } from 'src/app/services/tasks.service' import { TasksService } from 'src/app/services/tasks.service'
import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
@ -77,16 +77,16 @@ export class TasksComponent implements OnInit, OnDestroy {
get currentTasks(): PaperlessTask[] { get currentTasks(): PaperlessTask[] {
let tasks: PaperlessTask[] let tasks: PaperlessTask[]
switch (this.activeTab) { switch (this.activeTab) {
case 'PENDING': case 'queued':
tasks = this.tasksService.queuedFileTasks tasks = this.tasksService.queuedFileTasks
break break
case 'STARTED': case 'started':
tasks = this.tasksService.startedFileTasks tasks = this.tasksService.startedFileTasks
break break
case 'SUCCESS': case 'completed':
tasks = this.tasksService.completedFileTasks tasks = this.tasksService.completedFileTasks
break break
case 'FAILURE': case 'failed':
tasks = this.tasksService.failedFileTasks tasks = this.tasksService.failedFileTasks
break break
default: default:

2
src-ui/src/app/data/paperless-task.ts
View File

@ -23,7 +23,7 @@ export interface PaperlessTask extends ObjectWithId {
name: string name: string
created: Date date_created: Date
done?: Date done?: Date

2
src-ui/src/app/services/tasks.service.ts
View File

@ -1,6 +1,6 @@
import { HttpClient } from '@angular/common/http' import { HttpClient } from '@angular/common/http'
import { Injectable } from '@angular/core' import { Injectable } from '@angular/core'
import { first, map } from 'rxjs/operators' import { first } from 'rxjs/operators'
import { import {
PaperlessTask, PaperlessTask,
PaperlessTaskStatus, PaperlessTaskStatus,