MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Bug fixes and language updates. 

Admin Templates listing table fix. When a filter is applied, gets you to the first page. Total templates number fix .
Admin Template Editor. Enable editing Description in finalized templates.
Dataset wizard. Fix NaN in total progress when finalized. (remove all edit/save actions).
Portuguese language update.
This commit is contained in:
Kristian Ntavidi 2021-04-27 23:33:30 +03:00
parent 501ca9fcc2
commit e9e953aee3
13 changed files with 75 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts
View File

@ -23,7 +23,6 @@ import * as FileSaver from 'file-saver';
import { merge as observableMerge, Observable, of as observableOf } from 'rxjs'; import { merge as observableMerge, Observable, of as observableOf } from 'rxjs';
import { map, startWith, switchMap, takeUntil } from 'rxjs/operators'; import { map, startWith, switchMap, takeUntil } from 'rxjs/operators';
import { DialogConfirmationUploadDatasetProfiles } from './criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component'; import { DialogConfirmationUploadDatasetProfiles } from './criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component';
import { ParseStatus } from './pipe/parse-status.pipe';
@Component({ @Component({
selector: 'app-dataset-profile-listing-component', selector: 'app-dataset-profile-listing-component',
@ -104,6 +103,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI
refresh() { refresh() {
this.dataSource = new DatasetDataSource(this.datasetService, this._paginator, this.sort, this.criteria, this.itemId); this.dataSource = new DatasetDataSource(this.datasetService, this._paginator, this.sort, this.criteria, this.itemId);
this._paginator.pageIndex = 0;
} }
rowClick(rowId: String) { rowClick(rowId: String) {
@ -293,7 +293,8 @@ export class DatasetDataSource extends DataSource<DatasetListingModel> {
}), }),
map(result => { map(result => {
if (!result) { return []; } if (!result) { return []; }
if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } // if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; }
this.totalCount = result.totalCount;
return result.data; return result.data;
})); }));
} }

19
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
View File

@ -8,9 +8,14 @@
<div class="col"> <div class="col">
<div class="row"> <div class="row">
<div class="col info"> <div class="col info">
<div *ngIf="isNew" class="dataset-title">{{'DMP-EDITOR.TITLE.ADD-DATASET' | translate}}</div> <ng-container *ngIf="!viewOnly else viewOnlyTemplate">
<div *ngIf="!isNew" class="dataset-title">{{'DMP-EDITOR.TITLE.EDIT-DATASET' | translate}}</div> <div *ngIf="isNew" class="dataset-title">{{'DMP-EDITOR.TITLE.ADD-DATASET' | translate}}</div>
<div class="dataset-subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="dataset-changes">({{'DMP-EDITOR.CHANGES' | translate}})</span></div> <div *ngIf="!isNew" class="dataset-title">{{'DMP-EDITOR.TITLE.EDIT-DATASET' | translate}}</div>
<div class="dataset-subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="dataset-changes">({{'DMP-EDITOR.CHANGES' | translate}})</span></div>
</ng-container>
<ng-template #viewOnlyTemplate>
<div class="dataset-title">{{'DMP-EDITOR.TITLE.PREVIEW-DATASET' | translate}}</div>
</ng-template>
<div class="d-flex flex-direction-row dmp-info"> <div class="d-flex flex-direction-row dmp-info">
<div class="col-auto dataset-to-dmp">{{'DATASET-LISTING.TOOLTIP.TO-DMP' | translate}}</div> <div class="col-auto dataset-to-dmp">{{'DATASET-LISTING.TOOLTIP.TO-DMP' | translate}}</div>
<div class="dmp-title p-0">:&nbsp;{{ formGroup.get('dmp').value.label }}</div> <div class="dmp-title p-0">:&nbsp;{{ formGroup.get('dmp').value.label }}</div>
@ -21,7 +26,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row" *ngIf="!viewOnly">
<div class="col-auto d-flex align-items-center p-0"> <div class="col-auto d-flex align-items-center p-0">
<button *ngIf="isDirty()" type="button" mat-raised-button class="dataset-discard-btn" (click)="discardChanges()"> <button *ngIf="isDirty()" type="button" mat-raised-button class="dataset-discard-btn" (click)="discardChanges()">
{{'DMP-EDITOR.ACTIONS.DISCARD' | translate}} {{'DMP-EDITOR.ACTIONS.DISCARD' | translate}}
@ -59,7 +64,7 @@
</div> </div>
</div> </div>
<div class="stepper-actions"> <div class="stepper-actions">
<div mat-raised-button type="button" class="col-auto previous stepper-btn mr-2 ml-auto" [ngClass]="{'previous-disabled': this.step === 0}" (click)="previousStep()"> <div mat-raised-button type="button" class="col-auto previous stepper-btn mr-2" [ngClass]="{'previous-disabled': this.step === 0}" (click)="previousStep()">
<span class="material-icons">chevron_left</span> <span class="material-icons">chevron_left</span>
<div>{{'DMP-EDITOR.STEPPER.PREVIOUS' | translate}}</div> <div>{{'DMP-EDITOR.STEPPER.PREVIOUS' | translate}}</div>
</div> </div>
@ -71,12 +76,12 @@
<span class="material-icons">chevron_right</span> <span class="material-icons">chevron_right</span>
<div>{{'DMP-EDITOR.STEPPER.NEXT' | translate}}</div> <div>{{'DMP-EDITOR.STEPPER.NEXT' | translate}}</div>
</div> </div>
<div *ngIf="this.step === this.maxStep && !lockStatus && formGroup.get('profile').value" mat-raised-button type="button" class="col-auto stepper-btn add-dataset-btn ml-auto"> <div *ngIf="(this.step === this.maxStep) && !lockStatus && formGroup.get('profile').value && !viewOnly" mat-raised-button type="button" class="col-auto stepper-btn add-dataset-btn ml-auto">
<div (click)="save(saveAnd.addNew)">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-ADD' | translate }}</div> <div (click)="save(saveAnd.addNew)">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-ADD' | translate }}</div>
</div> </div>
</div> </div>
<div class="col-auto pr-0"> <div class="col-auto pr-0">
<app-form-progress-indication class="col-12" *ngIf="formGroup" [formGroup]="formGroup" [isDatasetEditor]="true"></app-form-progress-indication> <app-form-progress-indication class="col-12" *ngIf="formGroup && !viewOnly" [formGroup]="formGroup" [isDatasetEditor]="true"></app-form-progress-indication>
</div> </div>
</div> </div>
<div class="col-auto form" id="dataset-editor-form"> <div class="col-auto form" id="dataset-editor-form">

2
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss
View File

@ -281,7 +281,7 @@
} }
.stepper-options { .stepper-options {
height: calc(100vh - 520px); height: calc(100vh - 600px);
overflow-y: auto; overflow-y: auto;
.main-info { .main-info {
padding-left: .2rem; padding-left: .2rem;

2
dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.html
View File

@ -12,7 +12,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-auto pb-4"> <div class="col-auto pb-4">
<span>Are those options not enough?</span>&nbsp;<span class="new-dmp" (click)="startNewDmp()">Start new DMP</span> <span>{{'DASHBOARD.ADD-NEW-DATASET.OPTIONS-NOT-ENOUGH' | translate}}</span>&nbsp;<span class="new-dmp" (click)="startNewDmp()">{{'DASHBOARD.ADD-NEW-DATASET.START-NEW-DMP' | translate}}</span>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

7
dmp-frontend/src/assets/i18n/de.json
View File

@ -916,7 +916,8 @@
"CLONE-DMP": "Clone", "CLONE-DMP": "Clone",
"NEW-VERSION": "New Version", "NEW-VERSION": "New Version",
"CREATE-DATASET": "Creating Dataset Description", "CREATE-DATASET": "Creating Dataset Description",
"SUBTITLE": "DOI" "SUBTITLE": "DOI",
"PREVIEW-DATASET": "Previewing Dataset"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Titel", "NAME": "Titel",
@ -1504,6 +1505,10 @@
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.",
"GOT-IT":"Got it!", "GOT-IT":"Got it!",
"LEAVE-TOUR":"Leave Tour" "LEAVE-TOUR":"Leave Tour"
},
"ADD-NEW-DATASET":{
"OPTIONS-NOT-ENOUGH":"Are those options not enough?",
"START-NEW-DMP":"Start new DMP"
} }
}, },
"USER-DIALOG": { "USER-DIALOG": {

7
dmp-frontend/src/assets/i18n/en.json
View File

@ -916,7 +916,8 @@
"CLONE-DMP": "Clone", "CLONE-DMP": "Clone",
"NEW-VERSION": "New Version", "NEW-VERSION": "New Version",
"CREATE-DATASET": "Creating Dataset", "CREATE-DATASET": "Creating Dataset",
"SUBTITLE": "DOI" "SUBTITLE": "DOI",
"PREVIEW-DATASET": "Previewing Dataset"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Title of DMP", "NAME": "Title of DMP",
@ -1504,6 +1505,10 @@
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.",
"GOT-IT":"Got it!", "GOT-IT":"Got it!",
"LEAVE-TOUR":"Leave Tour" "LEAVE-TOUR":"Leave Tour"
},
"ADD-NEW-DATASET":{
"OPTIONS-NOT-ENOUGH":"Are those options not enough?",
"START-NEW-DMP":"Start new DMP"
} }
}, },
"USER-DIALOG": { "USER-DIALOG": {

7
dmp-frontend/src/assets/i18n/es.json
View File

@ -916,7 +916,8 @@
"CLONE-DMP": "Clone", "CLONE-DMP": "Clone",
"NEW-VERSION": "New Version", "NEW-VERSION": "New Version",
"CREATE-DATASET": "Creating Dataset Description", "CREATE-DATASET": "Creating Dataset Description",
"SUBTITLE": "DOI" "SUBTITLE": "DOI",
"PREVIEW-DATASET": "Previewing Dataset"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Título", "NAME": "Título",
@ -1504,6 +1505,10 @@
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.",
"GOT-IT":"Got it!", "GOT-IT":"Got it!",
"LEAVE-TOUR":"Leave Tour" "LEAVE-TOUR":"Leave Tour"
},
"ADD-NEW-DATASET":{
"OPTIONS-NOT-ENOUGH":"Are those options not enough?",
"START-NEW-DMP":"Start new DMP"
} }
}, },
"USER-DIALOG": { "USER-DIALOG": {

7
dmp-frontend/src/assets/i18n/gr.json
View File

@ -916,7 +916,8 @@
"CLONE-DMP": "Κλώνος", "CLONE-DMP": "Κλώνος",
"NEW-VERSION": "Νέα Έκδοση", "NEW-VERSION": "Νέα Έκδοση",
"CREATE-DATASET": "Δημιουργία Συνόλου Δεδομένων", "CREATE-DATASET": "Δημιουργία Συνόλου Δεδομένων",
"SUBTITLE": "Μονοσήμαντο Αναγνωριστικό Ψηφιακού Αντικειμένου (DOI)" "SUBTITLE": "Μονοσήμαντο Αναγνωριστικό Ψηφιακού Αντικειμένου (DOI)",
"PREVIEW-DATASET": "Προβολή Συνόλου Δεδομένων"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Τίτλος", "NAME": "Τίτλος",
@ -1504,6 +1505,10 @@
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.",
"GOT-IT":"Got it!", "GOT-IT":"Got it!",
"LEAVE-TOUR":"Leave Tour" "LEAVE-TOUR":"Leave Tour"
},
"ADD-NEW-DATASET":{
"OPTIONS-NOT-ENOUGH":"Are those options not enough?",
"START-NEW-DMP":"Start new DMP"
} }
}, },
"USER-DIALOG": { "USER-DIALOG": {

25
dmp-frontend/src/assets/i18n/pt.json
View File

@ -916,7 +916,8 @@
"CLONE-DMP": "Duplicar", "CLONE-DMP": "Duplicar",
"NEW-VERSION": "Nova Versão", "NEW-VERSION": "Nova Versão",
"CREATE-DATASET": "Criar Dataset", "CREATE-DATASET": "Criar Dataset",
"SUBTITLE": "DOI" "SUBTITLE": "DOI",
"PREVIEW-DATASET": "Pré-visualização do conjunto de dados"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Título do PGD", "NAME": "Título do PGD",
@ -1119,7 +1120,7 @@
"NEW": "Novo Plano de Gestão de Dados", "NEW": "Novo Plano de Gestão de Dados",
"EDIT": "Editar", "EDIT": "Editar",
"INTRO": "Um Plano de Gestão de Dados (PGD) permite uma maior proximidade com o local onde os seus dados são gerados, analisados e armazenados. O Argos é uma ferramenta aberta, extensível e colaborativa que disponibiliza Planos de Gestão de Dados FAIR e Abertos.", "INTRO": "Um Plano de Gestão de Dados (PGD) permite uma maior proximidade com o local onde os seus dados são gerados, analisados e armazenados. O Argos é uma ferramenta aberta, extensível e colaborativa que disponibiliza Planos de Gestão de Dados FAIR e Abertos.",
"INTRO-TIP": "Dica: Adicione tantos conjuntos de dados quantos os que tiver para descrever, para não gerar confusão na descrição da informação." "INTRO-TIP": "Dica: Adicione novos modelos de dados para descrever diferentes tipos de dados ou áreas temáticas."
}, },
"FIELDS": { "FIELDS": {
"NAME": "Designação do Dataset", "NAME": "Designação do Dataset",
@ -1147,12 +1148,12 @@
"DELETE": "Eliminar", "DELETE": "Eliminar",
"UPDATE": "Atualizar", "UPDATE": "Atualizar",
"DISCARD":{ "DISCARD":{
"DISCARD-NEW-MESSAGE":"All changes made will be discarded and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-NEW-MESSAGE":"Todas as alterações irão ser descartadas e será redirecionado para o editor do PGD. Pretende continuar?",
"DISCARD-NEW-CONFIRM":"Yes, discard and remove dataset.", "DISCARD-NEW-CONFIRM":"Sim, pretendo descartar e remover este modelo de dados.",
"DISCARD-NEW-DENY":"No.", "DISCARD-NEW-DENY":"Não",
"DISCARD-EDITED-MESSAGE":"All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?", "DISCARD-EDITED-MESSAGE":"All unsaved changes will be reverted to their initial state and you will be redirected back to DMP Editor. Would you like to proceed?",
"DISCARD-EDITED-CONFIRM":"Yes, revert changes and go back.", "DISCARD-EDITED-CONFIRM":"Yes, revert changes and go back.",
"DISCARD-EDITED-DENY":"No." "DISCARD-EDITED-DENY":"Não"
} }
}, },
"PLACEHOLDER": { "PLACEHOLDER": {
@ -1160,7 +1161,7 @@
"EXTERNAL-LINK": "Forneça uma ligação URL externa" "EXTERNAL-LINK": "Forneça uma ligação URL externa"
}, },
"HINT": { "HINT": {
"DESCRIPTION": "Descrever brevemente o contexto e o objetivo do conjunto de dados", "DESCRIPTION": "Descrever brevemente o contexto e o objetivo",
"TITLE": "Uma breve descrição do que o/a ", "TITLE": "Uma breve descrição do que o/a ",
"TITLE-REST": "é sobre o seu âmbito e objetivos." "TITLE-REST": "é sobre o seu âmbito e objetivos."
}, },
@ -1500,10 +1501,14 @@
"START-NEW": "Crie o seu PGD através do botão “Iniciar novo PGD”.", "START-NEW": "Crie o seu PGD através do botão “Iniciar novo PGD”.",
"IMPORT-DMP": "Aqui pode importar um PGD pré-existente...", "IMPORT-DMP": "Aqui pode importar um PGD pré-existente...",
"START-WIZARD": "... ou criar um novo no Argos!", "START-WIZARD": "... ou criar um novo no Argos!",
"DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.", "DATASET": "Aqui pode visualizar e editar todos os Modelos de Dados para os quais tenha contribuído ou criado.",
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "NEW-DATASET": "Através do botão “Adicionar um Modelo de Dados” pode em qualquer altura do processo de investigação adicionar e preencher um novo modelo de dados.",
"GOT-IT":"Ok, entendi!", "GOT-IT":"Ok, entendi!",
"LEAVE-TOUR":"Saltar a Apresentação" "LEAVE-TOUR":"Fechar"
},
"ADD-NEW-DATASET":{
"OPTIONS-NOT-ENOUGH":"Não pretende selecionar nenhum destes PGD?",
"START-NEW-DMP":"Criar novo PGD"
} }
}, },
"USER-DIALOG": { "USER-DIALOG": {

7
dmp-frontend/src/assets/i18n/sk.json
View File

@ -916,7 +916,8 @@
"CLONE-DMP": "Klonovať", "CLONE-DMP": "Klonovať",
"NEW-VERSION": "Nová verzia", "NEW-VERSION": "Nová verzia",
"CREATE-DATASET": "Vytvorenie súboru dát", "CREATE-DATASET": "Vytvorenie súboru dát",
"SUBTITLE": "DOI" "SUBTITLE": "DOI",
"PREVIEW-DATASET": "Previewing Dataset"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Názov", "NAME": "Názov",
@ -1504,6 +1505,10 @@
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.",
"GOT-IT":"Got it!", "GOT-IT":"Got it!",
"LEAVE-TOUR":"Leave Tour" "LEAVE-TOUR":"Leave Tour"
},
"ADD-NEW-DATASET":{
"OPTIONS-NOT-ENOUGH":"Are those options not enough?",
"START-NEW-DMP":"Start new DMP"
} }
}, },
"USER-DIALOG": { "USER-DIALOG": {

7
dmp-frontend/src/assets/i18n/sr.json
View File

@ -916,7 +916,8 @@
"CLONE-DMP": "Napravite kopiju", "CLONE-DMP": "Napravite kopiju",
"NEW-VERSION": "Nova verzija", "NEW-VERSION": "Nova verzija",
"CREATE-DATASET": "Kreiranje skupa podataka", "CREATE-DATASET": "Kreiranje skupa podataka",
"SUBTITLE": "DOI" "SUBTITLE": "DOI",
"PREVIEW-DATASET": "Previewing Dataset"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Naslov Plana", "NAME": "Naslov Plana",
@ -1504,6 +1505,10 @@
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.",
"GOT-IT":"Got it!", "GOT-IT":"Got it!",
"LEAVE-TOUR":"Leave Tour" "LEAVE-TOUR":"Leave Tour"
},
"ADD-NEW-DATASET":{
"OPTIONS-NOT-ENOUGH":"Are those options not enough?",
"START-NEW-DMP":"Start new DMP"
} }
}, },
"USER-DIALOG": { "USER-DIALOG": {

7
dmp-frontend/src/assets/i18n/tr.json
View File

@ -916,7 +916,8 @@
"CLONE-DMP": "Clone", "CLONE-DMP": "Clone",
"NEW-VERSION": "New Version", "NEW-VERSION": "New Version",
"CREATE-DATASET": "Creating Dataset", "CREATE-DATASET": "Creating Dataset",
"SUBTITLE": "DOI" "SUBTITLE": "DOI",
"PREVIEW-DATASET": "Previewing Dataset"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Başlık", "NAME": "Başlık",
@ -1504,6 +1505,10 @@
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.", "NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process.",
"GOT-IT":"Got it!", "GOT-IT":"Got it!",
"LEAVE-TOUR":"Leave Tour" "LEAVE-TOUR":"Leave Tour"
},
"ADD-NEW-DATASET":{
"OPTIONS-NOT-ENOUGH":"Are those options not enough?",
"START-NEW-DMP":"Start new DMP"
} }
}, },
"USER-DIALOG": { "USER-DIALOG": {

1
dmp-frontend/src/assets/resources/skipDisable.json
View File

@ -1,4 +1,5 @@
[ [
"DatasetProfileEditorModel.description",
"DatasetProfileEditorModel.label", "DatasetProfileEditorModel.label",
"SectionEditorModel.title", "SectionEditorModel.title",
"SectionEditorModel.description", "SectionEditorModel.description",