open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the dates

Browse Source
pull/5084/head
tidusjar 2 months ago
parent 06587d9345
commit a3688b6ad7
22 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
src/Ombi/ClientApp/src/app/components/detailed-card/detailed-card.component.html
Unescape View File

@ -14,7 +14,7 @@
<p id="detailed-request-requestedby-{{request.mediaId}}">{{'MediaDetails.RequestedBy' | translate}} {{request.username}}</p>
</div>
<div class="col-12">
<p id="detailed-request-date-{{request.mediaId}}">{{'MediaDetails.OnDate' | translate}} {{request.requestDate | dfnsFormat: 'Ppp'}}</p>
<p id="detailed-request-date-{{request.mediaId}}">{{'MediaDetails.OnDate' | translate}} {{request.requestDate | ombiDate: 'Ppp'}}</p>
</div>
<div class="col-12">
<p id="detailed-request-status-{{request.mediaId}}">{{'MediaDetails.Status' | translate}} <span class="badge badge-{{getClass(request)}}">{{getStatus(request) | translate}}</span></p>

2
src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html
Unescape View File

@ -2,7 +2,7 @@
<mat-card-header>
<mat-card-title>{{ issue.subject }}</mat-card-title>
<mat-card-subtitle>{{
'Issues.UserOnDate' | translate: { user: issue.userReported?.userName, date: issue.createdDate | dfnsFormat: 'PP' }
'Issues.UserOnDate' | translate: { user: issue.userReported?.userName, date: issue.createdDate | ombiDate: 'PP' }
}}</mat-card-subtitle>
<mat-card-subtitle>{{ issue.issueCategory.value }}</mat-card-subtitle>
</mat-card-header>

2
src/Ombi/ClientApp/src/app/issues/issueDetails.component.html
Unescape View File

@ -82,7 +82,7 @@
(click)="deleteComment(comment.id)"
></i>
<p>{{ comment.comment }}</p>
<time>{{ comment.username }} • {{ comment.date | dfnsFormat: 'Ppp' }}</time>
<time>{{ comment.username }} • {{ comment.date | ombiDate: 'Ppp' }}</time>
</div>
</div>
</div>

8
src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
Unescape View File

@ -49,8 +49,8 @@
<div *ngIf="request">
<span class="label">{{ 'MediaDetails.RequestDate' | translate }}</span>
<span *ngIf="request.requestedDate < request.requestedDate4k"> {{ request.requestedDate4k | dfnsFormat: 'PP' }}</span>
<span *ngIf="request.requestedDate > request.requestedDate4k"> {{ request.requestedDate | dfnsFormat: 'PP' }}</span>
<span *ngIf="request.requestedDate < request.requestedDate4k"> {{ request.requestedDate4k | ombiDate: 'PP' }}</span>
<span *ngIf="request.requestedDate > request.requestedDate4k"> {{ request.requestedDate | ombiDate: 'PP' }}</span>
</div>
<div *ngIf="request && request.source !== RequestSource.Ombi">
@ -90,11 +90,11 @@
<hr />
<span class="label">{{ 'MediaDetails.TheatricalRelease' | translate }}</span>
{{ movie.releaseDate | dfnsFormat: 'PP' }}
{{ movie.releaseDate | ombiDate: 'PP' }}
<div *ngIf="movie.digitalReleaseDate">
<span class="label">{{ 'MediaDetails.DigitalRelease' | translate }}</span>
{{ movie.digitalReleaseDate | dfnsFormat: 'PP' }}
{{ movie.digitalReleaseDate | ombiDate: 'PP' }}
</div>
<div *ngIf="movie.voteCount">

2
src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.html
Unescape View File

@ -8,7 +8,7 @@
<div class="mobile-top-text">
<h1 id="mediaTitle" class="large-text">
{{ title }}
<span *ngIf="releaseDateFormat" class="grey-text"> ({{ releaseDate | dfnsFormat: 'P' }})</span>
<span *ngIf="releaseDateFormat" class="grey-text"> ({{ releaseDate | ombiDate: 'P' }})</span>
</h1>
<h2 class="tagline">{{ tagline }}</h2>

2
src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
Unescape View File

@ -31,7 +31,7 @@
<span id="status"> {{ tv.status | translateStatus }}</span>
</div>
<span class="label">{{ 'MediaDetails.FirstAired' | translate }}</span>
{{ tv.firstAired | dfnsFormat: 'PP' }}
{{ tv.firstAired | ombiDate: 'PP' }}
</div>
<div *ngIf="seasonCount">

2
src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html
Unescape View File

@ -48,7 +48,7 @@
<ng-container matColumnDef="airDate">
<th mat-header-cell *matHeaderCellDef>{{ 'Requests.AirDate' | translate }}</th>
<td mat-cell *matCellDef="let element">{{ element.airDate | dfnsFormat: 'P' }}</td>
<td mat-cell *matCellDef="let element">{{ element.airDate | ombiDate: 'P' }}</td>
</ng-container>
<ng-container matColumnDef="status">

4
src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.html
Unescape View File

@ -10,7 +10,7 @@
| translate
: {
user: request.requestedUser.userAlias,
date: request.requestedDate | dfnsFormat: 'PP'
date: request.requestedDate | ombiDate: 'PP'
}
}}
<span *ngIf="request.denied"> - {{ request.deniedReason }}</span>
@ -35,7 +35,7 @@
<ng-container matColumnDef="airDate">
<th mat-header-cell *matHeaderCellDef>{{ 'Requests.AirDate' | translate }}</th>
<td mat-cell *matCellDef="let element">{{ element.airDate | dfnsFormat: 'P' }}</td>
<td mat-cell *matCellDef="let element">{{ element.airDate | ombiDate: 'P' }}</td>
</ng-container>
<ng-container matColumnDef="status">

17
src/Ombi/ClientApp/src/app/pipes/OmbiDatePipe.ts
Unescape View File

@ -0,0 +1,17 @@
import { Pipe, PipeTransform } from "@angular/core";
import { FormatPipe } from 'ngx-date-fns';
@Pipe({
name: "ombiDate",
})
export class OmbiDatePipe implements PipeTransform {
constructor(
private FormatPipe: FormatPipe,
) {}
public transform(value: string, format: string ) {
const date = new Date(value);
return this.FormatPipe.transform(date, format);
}
}

10
src/Ombi/ClientApp/src/app/pipes/ThousandShortPipe.ts
Unescape View File

@ -5,19 +5,19 @@
})
export class ThousandShortPipe implements PipeTransform {
transform(input: any, args?: any): any {
var exp, rounded,
var exp,
suffixes = ['k', 'M', 'G', 'T', 'P', 'E'];
if (Number.isNaN(input)) {
return null;
}
if (input < 1000) {
return input;
}
exp = Math.floor(Math.log(input) / Math.log(1000));
return (input / Math.pow(1000, exp)).toFixed(args) + suffixes[exp - 1];
}
}

9
src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
Unescape View File

@ -5,11 +5,14 @@ import { ThousandShortPipe } from './ThousandShortPipe';
import { SafePipe } from './SafePipe';
import { QualityPipe } from './QualityPipe';
import { OrderPipe } from './OrderPipe';
import { OmbiDatePipe } from './OmbiDatePipe';
import { FormatPipeModule, FormatPipe } from 'ngx-date-fns';
@NgModule({
imports: [],
declarations: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, TranslateStatusPipe, OrderPipe],
exports: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, TranslateStatusPipe, OrderPipe],
imports: [FormatPipeModule],
declarations: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, TranslateStatusPipe, OrderPipe, OmbiDatePipe],
exports: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, TranslateStatusPipe, OrderPipe, OmbiDatePipe],
providers: [FormatPipe],
})
export class PipeModule {
public static forRoot(): ModuleWithProviders<PipeModule> {

4
src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.html
Unescape View File

@ -85,7 +85,7 @@
</ng-container>
<ng-container matColumnDef="title">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>{{ 'Requests.AlbumName' | translate }}</th>
<td mat-cell *matCellDef="let element">{{ element.title }} ({{ element.releaseDate | dfnsFormat: 'P' }})</td>
<td mat-cell *matCellDef="let element">{{ element.title }} ({{ element.releaseDate | ombiDate: 'P' }})</td>
</ng-container>
<ng-container matColumnDef="requestedUser.requestedBy">
@ -95,7 +95,7 @@
<ng-container matColumnDef="requestedDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>{{ 'Requests.RequestDate' | translate }}</th>
<td mat-cell *matCellDef="let element">{{ element.requestedDate | dfnsFormat: 'PP' }}</td>
<td mat-cell *matCellDef="let element">{{ element.requestedDate | ombiDate: 'PP' }}</td>
</ng-container>
<ng-container matColumnDef="requestStatus">

4
src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html
Unescape View File

@ -112,7 +112,7 @@
<ng-container matColumnDef="title">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>{{ 'Requests.RequestsTitle' | translate }}</th>
<td mat-cell id="title{{ element.id }}" *matCellDef="let element">{{ element.title }} ({{ element.releaseDate | dfnsFormat: 'P' }})</td>
<td mat-cell id="title{{ element.id }}" *matCellDef="let element">{{ element.title }} ({{ element.releaseDate | ombiDate: 'P' }})</td>
</ng-container>
<ng-container matColumnDef="requestedUser.requestedBy">
@ -124,7 +124,7 @@
<ng-container matColumnDef="requestedDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>{{ 'Requests.RequestDate' | translate }}</th>
<td mat-cell id="requestedDate{{ element.id }}" *matCellDef="let element">{{ getRequestDate(element) | dfnsFormat: 'PP' }}</td>
<td mat-cell id="requestedDate{{ element.id }}" *matCellDef="let element">{{ getRequestDate(element) | ombiDate: 'PP' }}</td>
</ng-container>
<ng-container matColumnDef="status">

2
src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html
Unescape View File

@ -103,7 +103,7 @@
<ng-container matColumnDef="requestedDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>{{ 'Requests.RequestDate' | translate }}</th>
<td id="requestedDate{{ element.id }}" mat-cell *matCellDef="let element">
{{ element.requestedDate | dfnsFormat: 'PP' }}
{{ element.requestedDate | ombiDate: 'PP' }}
</td>
</ng-container>

8
src/Ombi/ClientApp/src/app/requests/movierequests.component.html
Unescape View File

@ -49,7 +49,7 @@
<div class="col-sm-5 small-padding">
<div>
<a href="http://www.imdb.com/title/{{ request.imdbId }}/" target="_blank">
<h4 class="request-title">{{ request.title }} ({{ request.releaseDate | dfnsFormat: 'P' }})</h4>
<h4 class="request-title">{{ request.title }} ({{ request.releaseDate | ombiDate: 'P' }})</h4>
</a>
</div>
<br />
@ -91,12 +91,12 @@
</div>
<div id="releaseDate">
{{ 'Requests.TheatricalRelease' | translate: { date: request.releaseDate | dfnsFormat: 'PP' } }}
{{ 'Requests.TheatricalRelease' | translate: { date: request.releaseDate | ombiDate: 'PP' } }}
</div>
<div *ngIf="request.digitalReleaseDate" id="digitalReleaseDate">
{{ 'Requests.DigitalRelease' | translate: { date: request.digitalReleaseDate | dfnsFormat: 'PP' } }}
{{ 'Requests.DigitalRelease' | translate: { date: request.digitalReleaseDate | ombiDate: 'PP' } }}
</div>
<div id="requestedDate">{{ 'Requests.RequestDate' | translate }} {{ request.requestedDate | dfnsFormat: 'PP' }}</div>
<div id="requestedDate">{{ 'Requests.RequestDate' | translate }} {{ request.requestedDate | ombiDate: 'PP' }}</div>
<br />
</div>
<div *ngIf="isAdmin">

4
src/Ombi/ClientApp/src/app/requests/music/musicrequests.component.html
Unescape View File

@ -97,8 +97,8 @@
<i style="color: red" class="fas fa-check" pTooltip="{{ request.deniedReason }}"></i>
</div>
<div id="releaseDate">{{ 'Requests.ReleaseDate' | translate: { date: request.releaseDate | dfnsFormat: 'PP' } }}</div>
<div id="requestedDate">{{ 'Requests.RequestDate' | translate }} {{ request.requestedDate | dfnsFormat: 'PP' }}</div>
<div id="releaseDate">{{ 'Requests.ReleaseDate' | translate: { date: request.releaseDate | ombiDate: 'PP' } }}</div>
<div id="requestedDate">{{ 'Requests.RequestDate' | translate }} {{ request.requestedDate | ombiDate: 'PP' }}</div>
<br />
</div>
<!-- <div *ngIf="isAdmin">

2
src/Ombi/ClientApp/src/app/requests/tvrequest-children.component.html
Unescape View File

@ -115,7 +115,7 @@
{{ ep.title }}
</td>
<td>
{{ ep.airDate | dfnsFormat: 'P' }}
{{ ep.airDate | ombiDate: 'P' }}
</td>
<td>
<span *ngIf="child.denied" class="label label-danger" id="deniedLabel" [translate]="'Common.Denied'">

4
src/Ombi/ClientApp/src/app/requests/tvrequests.component.html
Unescape View File

@ -26,7 +26,7 @@
<div class="col-sm-5 small-padding">
<div>
<a href="http://www.imdb.com/title/{{ node.imdbId }}/" target="_blank">
<h4 class="request-title">{{ node.title }} ({{ node.releaseDate | dfnsFormat: 'P' }})</h4>
<h4 class="request-title">{{ node.title }} ({{ node.releaseDate | ombiDate: 'P' }})</h4>
</a>
</div>
<br />
@ -35,7 +35,7 @@
<span class="label label-success">{{ node.status }}</span>
</div>
<div>Release Date: {{ node.releaseDate | dfnsFormat: 'PP' }}</div>
<div>Release Date: {{ node.releaseDate | ombiDate: 'PP' }}</div>
<div *ngIf="isAdmin">
<div *ngIf="node.qualityOverrideTitle" class="quality-override">
{{ 'Requests.QualityOverride' | translate }}

2
src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html
Unescape View File

@ -13,7 +13,7 @@
</div>
</div>
<small>Updated at {{ data.updateDate | dfnsFormat: 'PP' }}</small>
<small>Updated at {{ data.updateDate | ombiDate: 'PP' }}</small>
</mat-dialog-content>
<div mat-dialog-actions class="right-buttons">

2
src/Ombi/ClientApp/src/app/shared/chat-box/chat-box.component.html
Unescape View File

@ -16,7 +16,7 @@
<p class="name" *ngIf="m?.username">{{ m.username }}</p>
<br />
<p class="message">{{ m.message }}</p>
<p class="timestamp">{{ m.date | dfnsFormat: 'Ppp' }}</p>
<p class="timestamp">{{ m.date | ombiDate: 'Ppp' }}</p>
</div>
</div>
</div>

2
src/Ombi/ClientApp/src/app/shared/episode-request/episode-request.component.html
Unescape View File

@ -73,7 +73,7 @@
{{ ep.title }}
</div>
<div class="col-2" *ngIf="ep.airDateDisplay != 'Unknown'">
{{ ep.airDate | dfnsFormat: 'P' }}
{{ ep.airDate | ombiDate: 'P' }}
</div>
<div class="col-2" *ngIf="ep.airDateDisplay == 'Unknown'">
{{ ep.airDateDisplay }}

8
src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
Unescape View File

@ -70,13 +70,13 @@
<th mat-header-cell *matHeaderCellDef>Next Request Due</th>
<td mat-cell *matCellDef="let u">
<div *ngIf="u.movieRequestQuota != null && u.movieRequestQuota.remaining != u.movieRequestLimit">
{{ 'UserManagment.MovieDue' | translate: { date: (u.movieRequestQuota.nextRequest | dfnsFormat: 'P') } }}
{{ 'UserManagment.MovieDue' | translate: { date: (u.movieRequestQuota.nextRequest | ombiDate: 'P') } }}
</div>
<div *ngIf="u.episodeRequestQuota != null && u.episodeRequestQuota.remaining != u.episodeRequestLimit">
{{ 'UserManagment.TvDue' | translate: { date: (u.episodeRequestQuota.nextRequest | dfnsFormat: 'P') } }}
{{ 'UserManagment.TvDue' | translate: { date: (u.episodeRequestQuota.nextRequest | ombiDate: 'P') } }}
</div>
<div *ngIf="u.musicRequestQuota != null && u.musicRequestQuota.remaining != u.musicRequestLimit">
{{ 'UserManagment.MusicDue' | translate: { date: (u.musicRequestQuota.nextRequest | dfnsFormat: 'P') } }}
{{ 'UserManagment.MusicDue' | translate: { date: (u.musicRequestQuota.nextRequest | ombiDate: 'P') } }}
</div>
</td>
</ng-container>
@ -84,7 +84,7 @@
<th mat-header-cell *matHeaderCellDef mat-sort-header>Last Logged In</th>
<td mat-cell *matCellDef="let u">
<span *ngIf="u.lastLoggedIn">
{{ u.lastLoggedIn | dfnsFormat: 'Ppp' }}
{{ u.lastLoggedIn | ombiDate: 'Ppp' }}
</span>
<span *ngIf="!u.lastLoggedIn"> Not logged in yet! </span>
</td>

Write Preview
Loading…
Cancel
Save