Skip to content

Commit f55755d

Browse files
committed
Fixes over transcription workflow
1 parent 2f1d952 commit f55755d

17 files changed

Lines changed: 55 additions & 33 deletions

File tree

src/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class AppComponent implements OnInit{
5454
logout() : void {
5555
localStorage.removeItem('currentUser');
5656
this.global['currentUser'] = null;
57-
this.global['isOwner'] = null;
57+
localStorage.removeItem('isOwner');
5858
localStorage.removeItem('functions');
5959
localStorage.removeItem('currentUser');
6060
this.router.navigate(['home'])

src/app/components/admin/admin.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ <h4 class="m-b-20">{{'admin.title' | translate}}</h4>
88
<mz-tab
99
[fixedTabWidth]="'true'"
1010
[responsiveThreshold]="'true'"
11-
[swipeable]="'true'">
11+
[swipeable]="'true'"
12+
[onShow]="onShow()">
1213
<mz-tab-item
1314
[class]="'col s12'"
1415
[active]="'true'"

src/app/components/admin/admin.component.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@
1111
text-transform: capitalize;
1212
font-weight: bold;
1313
}
14-
15-
:host ::ng-deep .tabs-content{
16-
height: 620px !important;
17-
}

src/app/components/admin/admin.component.ts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { User } from './../../models/user';
22
import { UserService } from './../../services/user/user.service';
33
import { AdminService } from './../../services/admin/admin.service';
44
import { Component, OnInit, ViewChild } from '@angular/core';
5+
import { MappingUtils } from 'app/utils/mapping-utils';
6+
import { LocalizedDatePipe } from 'app/pipes/localized-date/localized-date.pipe';
57

68
@Component({
79
selector: 'app-admin',
@@ -17,22 +19,26 @@ export class AdminComponent implements OnInit {
1719
public users : any;
1820
public itemsloaded = false;
1921
public headers = [
20-
{ title: 'login', key: 'login' },
22+
{ title: 'username', key: 'login' },
2123
{ title: 'email', key: 'email'},
22-
{ title: 'registered', key:'created_at'},
24+
{ title: 'registered', key:'registered_at'},
2325
{ title: 'Owner', key:'owner'},
2426
{ title: 'Admin', key: 'admin'}
2527
];
2628
public user : any;
2729

28-
constructor(private admService: AdminService, private userService: UserService) { }
30+
constructor(private admService: AdminService, private userService: UserService, private localizedDatePipe: LocalizedDatePipe) { }
2931

3032
ngOnInit() {
3133
this.listUsers(1);
3234
}
3335
changeOwner(event){
3436
}
3537

38+
onShow() {
39+
$('.tabs-content.carousel').height($('.carousel-item.active .row').height());
40+
}
41+
3642
handleModal(event) {
3743
this.user = null;
3844
if(event.modal=='edit'){
@@ -59,7 +65,11 @@ export class AdminComponent implements OnInit {
5965
this.currentPage = response.currentPage;
6066
this.itemsPerPage = response.itemsPerPage;
6167
this.totalItems = response.totalItems;
62-
this.users=response.items;
68+
this.users = MappingUtils.mapToClass(User, response.items);
69+
this.users = this.users.map(user => {
70+
user.registered_at = this.localizedDatePipe.transform(user.created_at, 'short')
71+
return user
72+
})
6373
this.itemsloaded=true;
6474
});
6575
}

src/app/components/collection/edit-collection/edit-collection.component.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@
5656
<button mz-button class="btn-delete m-l-5" (click)="delete()"><i mz-icon-mdi [icon]="'delete-forever'"
5757
[align]="'left'"></i>{{'editCollection.button.delete' | translate}}</button>
5858
</div>
59-
60-
<div class="row m-t-10">
59+
<br>
60+
<div class="row">
61+
<h6>{{ 'editCollection.label.owners' | translate }}</h6>
6162
<div class="col s12">
6263
<app-paginated-list *ngIf="itemsloaded" [currentPage]="currentPage" [itemsPerPage]="itemsPerPage"
6364
[totalItems]="totalItems" [items]="users" [headers]="headers" [headersActions]="headersActions"

src/app/components/collection/show-collection/show-collection.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@ export class ShowCollectionComponent implements OnInit {
2424
private changeDetector: ChangeDetectorRef,
2525
private flashMessagesService: FlashMessagesService) {
2626
this.global['routeBack'] = "collections/list";
27-
this.global['isOwner'] = false;
28-
27+
localStorage.setItem('isOwner', "false");
2928
}
3029

3130
ngOnInit() {
3231
const collectionId = +this.route.snapshot.paramMap.get('collectionId');
3332
this.collectionService.get(collectionId, { fields: ['owner','isOwner']}).subscribe(collection => {
3433
this.collection = collection
35-
this.global['isOwner'] = collection.isOwner;
34+
localStorage.setItem('isOwner', `${collection.isOwner}`);
3635
this.collectionImageUrl = this.collection.getThumbnailUrl()
3736
});
3837
this.changeDetector.detectChanges();

src/app/components/search/reference-container/reference-container.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<mz-collapsible-item-body>
1919
<mz-collection>
2020
<a mz-collection-link class="bordered" *ngFor="let mark of marks" (click)="onReferenceSelection.emit(mark)">
21-
<span class="mark-label">{{mark.semanticContribution.created_at | localizedDate}} - </span>{{ mark.getSemanticLabel() }}
21+
<span class="mark-label">{{mark.semanticContribution.created_at | localizedDate}} - </span>{{ mark.getSemanticLabel() }}
2222
<span class="badge-scheme-type"><small>{{mark.semanticContribution.schema_type | ontologyPrefix}}</small></span>
2323
<span mz-secondary-content><!--<a>VER MÁS</a>--><i mz-icon-mdi [icon]="'chevron-right'" [align]="'right'"></i></span>
2424
</a>

src/app/components/shared/paginated-list/paginated-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</button>
1414
</div>
1515
<div class="col s12">
16-
<table class="striped responsive-table">
16+
<table class="striped">
1717
<thead>
1818
<tr >
1919
<th *ngFor="let header of headers">{{header.title}}</th>

src/app/components/shared/paginated-list/paginated-list.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22

33
.action{
44
color: $primaryColor;
5+
}
6+
7+
:host ::ng-deep .pagination li.active {
8+
background-color: $primaryColor;
59
}

src/app/components/transcribe/semantic/semantic-form/steps/select-basic-properties/select-basic-properties.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ <h5 class="primary-color-text">{{ontologyInstance.name | ontologyPrefix}}</h5>
5454
</tr>
5555
</thead>
5656
<tbody>
57-
<tr *ngFor="let prop of properties | filterlist:'label':searchTextFilter:'equal'">
57+
<tr *ngFor="let prop of properties | filterlist:'label':searchTextFilter:'includes'">
5858
<td>{{prop.label}}</td>
5959
<td>
6060
<mz-select-container *ngIf="prop.types.length>1" (click)="$event.stopPropagation()">

0 commit comments

Comments
 (0)