Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

holdings: fix holding detail page display #472

Merged
merged 1 commit into from
Dec 15, 2020
Merged

holdings: fix holding detail page display #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 97 additions & 99 deletions .../holding-detail-view/serial-holding-detail-view/serial-holding-detail-view.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ <h1 class="mb-5">
<ng-template tabHeading>
<i class="fa fa-list-ul mr-1"></i><span translate>Issues</span>
</ng-template>
<div class="row mt-2">
<div class="col mt-1">
<button class="btn btn-sm btn-outline-primary float-right"
<div class="mt-2">
<div class="d-flex flex-row-reverse">
<button class="btn btn-sm btn-outline-primary"
[routerLink]="['/records', 'items', 'new']"
[queryParams]="{
'holding': holding.id,
Expand All @@ -57,109 +57,107 @@ <h1 class="mb-5">
{{ 'Add irregular issue' | translate }} ...
</button>
</div>
<div class="col">
<div class="card mt-2">
<div class="card-header">
<div class="row">
<div class="col-sm-4" translate>Numbering</div>
<div class="col-sm-1 text-center" translate>Status</div>
<div class="col-sm-2" translate>Call number</div>
<div class="col-sm-3" translate>Reception date</div>
</div>
<div class="card mt-2">
<div class="card-header">
<div class="row">
<div class="col-sm-4" translate>Numbering</div>
<div class="col-sm-1 text-center" translate>Status</div>
<div class="col-sm-2" translate>Call number</div>
<div class="col-sm-3" translate>Reception date</div>
</div>
<div class="card-body">
</div>
<div class="card-body">

<!-- SHOW MORE PREDICTIONS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<div class="row mt-1 mb-2">
<a [routerLink]="" (click)="showMore('prediction', 3)" class="col">
<i class="fa fa-arrow-circle-o-up" aria-hidden="true"></i>
{{ 'Show more' | translate }} ...
</a>
<!-- SHOW MORE PREDICTIONS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<div class="row mt-1 mb-2">
<a [routerLink]="" (click)="showMore('prediction', 3)" class="col">
<i class="fa fa-arrow-circle-o-up" aria-hidden="true"></i>
{{ 'Show more' | translate }} ...
</a>
</div>
<!-- PREDICTIONS ISSUES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<div class="row mt-1 expected-issue" *ngFor="let prediction of predictionsItems; let last = last">
<div class="col-sm-5 text" [ngClass]="{'pb-2': !last}">{{ prediction.issue }}</div>
<div class="offset-sm-2 col-sm-3 text">
{{'expected at' | translate }}
{{ prediction.expected_date | dateTranslate }}
</div>
<!-- PREDICTIONS ISSUES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<div class="row mt-1 expected-issue" *ngFor="let prediction of predictionsItems; let last = last">
<div class="col-sm-5 text" [ngClass]="{'pb-2': !last}">{{ prediction.issue }}</div>
<div class="offset-sm-2 col-sm-3 text">
{{'expected at' | translate }}
{{ prediction.expected_date | dateTranslate }}
</div>
<div class="col-sm-2 text-right" *ngIf="last">
<!-- QUICK RECEIVE BUTTON -->
<button type="button" class="btn btn-sm btn-outline-primary ml-1"
title="{{ 'Quick receive' | translate }}"
(click)="quickIssueReceive()">
<i class="fa fa-file-text-o"></i>
</button>
<!-- RECEIVE ISSUE BUTTON -->
<button type="button" class="btn btn-sm btn-outline-primary ml-1"
title="{{ 'Receive and edit this issue' | translate }}"
[routerLink]="['/records', 'items', 'new']"
[queryParams]="{
'holding': holding.id,
'redirectTo': 'records/holdings/detail/' + holding.id,
'enumerationAndChronology': prediction.issue,
'expected_date': prediction.expected_date
}">
<i class="fa fa-pencil"></i>
</button>
</div>
<div class="col-sm-2 text-right" *ngIf="last">
<!-- QUICK RECEIVE BUTTON -->
<button type="button" class="btn btn-sm btn-outline-primary ml-1"
title="{{ 'Quick receive' | translate }}"
(click)="quickIssueReceive()">
<i class="fa fa-file-text-o"></i>
</button>
<!-- RECEIVE ISSUE BUTTON -->
<button type="button" class="btn btn-sm btn-outline-primary ml-1"
title="{{ 'Receive and edit this issue' | translate }}"
[routerLink]="['/records', 'items', 'new']"
[queryParams]="{
'holding': holding.id,
'redirectTo': 'records/holdings/detail/' + holding.id,
'enumerationAndChronology': prediction.issue,
'expected_date': prediction.expected_date
}">
<i class="fa fa-pencil"></i>
</button>
</div>
<!-- RECEIVED ISSUES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<div class="row mt-1 "
*ngFor="let item of this.receivedItems"
[ngClass]="{'deleted-status': item.metadata.issue.status == 'deleted'}">
<div class="col-sm-4 text">
{{ item.metadata.enumerationAndChronology }}
<span class="badge badge-pill badge-info pl-2" *ngIf="item.new_issue" translate>New</span>
</div>
<div class="col-sm-1 text-center">
<i class="fa" title="{{ item.metadata.issue.status | translate }}"
[ngClass]="getIcon(item.metadata.issue.status)"
></i>
</div>
<div class="col-sm-2 text">{{ item.metadata.call_number }}</div>
<div class="col-sm-3 text">{{ item.metadata.issue.received_date | dateTranslate }}</div>
<div class="col-sm-2 text-right">
<!-- DETAIL BUTTON -->
<button type="button" class="btn btn-sm btn-outline-primary"
title="{{ 'Detail' | translate }}"
[routerLink]="['/records', 'items', 'detail', item.metadata.pid]">
<i class="fa fa-eye"></i>
</button>
<!-- EDIT BUTTON -->
<button *ngIf="item.permissions && item.permissions.update && item.permissions.update.can"
type="button" class="btn btn-sm btn-outline-primary ml-1"
title="{{ 'Edit' | translate}}"
[routerLink]="['/records', 'items', 'edit', item.metadata.pid]"
[queryParams]="{'redirectTo': 'records/holdings/detail/' + holding.id }">
<i class="fa fa-pencil"></i>
</button>
<!-- DELETE BUTTON -->
<button *ngIf="item.permissions && item.permissions.delete && item.permissions.delete.can; else deleteInfo"
type="button" class="btn btn-outline-danger btn-sm ml-1"
</div>
<!-- RECEIVED ISSUES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<div class="row mt-1 "
*ngFor="let item of this.receivedItems"
[ngClass]="{'deleted-status': item.metadata.issue.status == 'deleted'}">
<div class="col-sm-4 text">
{{ item.metadata.enumerationAndChronology }}
<span class="badge badge-pill badge-info pl-2" *ngIf="item.new_issue" translate>New</span>
</div>
<div class="col-sm-1 text-center">
<i class="fa" title="{{ item.metadata.issue.status | translate }}"
[ngClass]="getIcon(item.metadata.issue.status)"
></i>
</div>
<div class="col-sm-2 text">{{ item.metadata.call_number }}</div>
<div class="col-sm-3 text">{{ item.metadata.issue.received_date | dateTranslate }}</div>
<div class="col-sm-2 text-right">
<!-- DETAIL BUTTON -->
<button type="button" class="btn btn-sm btn-outline-primary"
title="{{ 'Detail' | translate }}"
[routerLink]="['/records', 'items', 'detail', item.metadata.pid]">
<i class="fa fa-eye"></i>
</button>
<!-- EDIT BUTTON -->
<button *ngIf="item.permissions && item.permissions.update && item.permissions.update.can"
type="button" class="btn btn-sm btn-outline-primary ml-1"
title="{{ 'Edit' | translate}}"
[routerLink]="['/records', 'items', 'edit', item.metadata.pid]"
[queryParams]="{'redirectTo': 'records/holdings/detail/' + holding.id }">
<i class="fa fa-pencil"></i>
</button>
<!-- DELETE BUTTON -->
<button *ngIf="item.permissions && item.permissions.delete && item.permissions.delete.can; else deleteInfo"
type="button" class="btn btn-outline-danger btn-sm ml-1"
title="{{ 'Delete' | translate}}"
(click)="deleteIssue(item)">
<i class="fa fa-trash" ></i>
</button>
<ng-template #deleteInfo>
<button type="button" class="btn btn-sm btn-outline-danger ml-1 disabled"
title="{{ 'Delete' | translate}}"
(click)="deleteIssue(item)">
<i class="fa fa-trash" ></i>
[popover]="tolTemplate" triggers="mouseenter:mouseleave">
<i class="fa fa-trash"></i>
</button>
<ng-template #deleteInfo>
<button type="button" class="btn btn-sm btn-outline-danger ml-1 disabled"
title="{{ 'Delete' | translate}}"
[popover]="tolTemplate" triggers="mouseenter:mouseleave">
<i class="fa fa-trash"></i>
</button>
<ng-template #tolTemplate><div [innerHtml]="deleteInfoMessage(item) | nl2br"></div></ng-template>
</ng-template>
</div>
<ng-template #tolTemplate><div [innerHtml]="deleteInfoMessage(item) | nl2br"></div></ng-template>
</ng-template>
</div>
<!-- SHOW MORE RECEIVED ISSUE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<div class="row mt-1" *ngIf="receivedItems.length < totalReceivedItems">
<div class="col">
<a [routerLink]="" (click)="showMore('received', 5)">
<i class="fa fa-arrow-circle-o-down" aria-hidden="true"></i>
{{ 'Show more' | translate }} ...
</a>
<span class="pl-3 small text-secondary">({{ showMoreIssuesCounter }})</span>
</div>
</div>
<!-- SHOW MORE RECEIVED ISSUE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<div class="row mt-1" *ngIf="receivedItems.length < totalReceivedItems">
<div class="col">
<a [routerLink]="" (click)="showMore('received', 5)">
<i class="fa fa-arrow-circle-o-down" aria-hidden="true"></i>
{{ 'Show more' | translate }} ...
</a>
<span class="pl-3 small text-secondary">({{ showMoreIssuesCounter }})</span>
</div>
</div>
</div>
Expand Down
16 changes: 9 additions & 7 deletions projects/admin/src/app/record/detail-view/local-field/local-field.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,13 @@
</ng-container>

<ng-template #addLocalField>
<a
[routerLink]="['/records', 'local_fields', 'new']"
[queryParams]="{ type: resourceType, ref: resourcePid }"
class="btn btn-sm btn-outline-primary ml-3 mt-2"
>
<i class="fa fa-plus-square-o"></i> {{ 'Add local fields' | translate }}
</a>
<div class="d-flex flex-row-reverse">
<a
[routerLink]="['/records', 'local_fields', 'new']"
[queryParams]="{ type: resourceType, ref: resourcePid }"
class="btn btn-sm btn-outline-primary"
>
<i class="fa fa-plus-square-o"></i> {{ 'Add local fields' | translate }}
</a>
</div>
</ng-template>