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

Adds drafts listing on dashboard

This commit is contained in:
apapachristou 2020-07-01 10:56:59 +03:00
parent 1230bd2417
commit 5db3485079
7 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dashboard/dashboard.component.html
View File

@ -62,7 +62,7 @@
</div>
</mat-tab>
<mat-tab label="{{'DASHBOARD.DRAFTS' | translate}}">
<!-- <app-drafts></app-drafts> -->
<app-drafts></app-drafts>
</mat-tab>
<mat-tab label="{{'DASHBOARD.DMPS' | translate}}">
<div class="col-auto pt-3"><input type="text" class="d-flex ml-auto" placeholder="&nbsp;&nbsp;&#xf002;&nbsp;&nbsp;Search"></div>

2
dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
View File

@ -8,8 +8,6 @@ import { SearchBarItem } from '@app/core/model/dashboard/search-bar-item';
import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
import { DatasetListingModel } from '@app/core/model/dataset/dataset-listing';
import { DmpListingModel } from '@app/core/model/dmp/dmp-listing';
import { ExploreDatasetCriteriaModel } from '@app/core/query/explore-dataset/explore-dataset-criteria';
import { ExploreDmpCriteriaModel } from '@app/core/query/explore-dmp/explore-dmp-criteria';
import { GrantCriteria } from '@app/core/query/grant/grant-criteria';
import { RequestItem } from '@app/core/query/request-item';
import { AuthService } from '@app/core/services/auth/auth.service';

7
dmp-frontend/src/app/ui/dashboard/dashboard.module.ts
View File

@ -14,16 +14,17 @@ import { RecentVisitedActivityComponent } from '@app/ui/dashboard/recent-visited
import { WizardComponent } from '@app/ui/dashboard/wizard/wizard.component';
import { CommonUiModule } from '@common/ui/common-ui.module';
import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
import { GuestModule } from '../guest/guest.module';
import { GuestComponent } from '../guest/guest.component';
import { RecentEditedDatasetActivityComponent } from './recent-edited-dataset-activity/recent-edited-dataset-activity.component';
import { DatasetCopyDialogueComponent } from '../dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component';
import { DatasetCopyDialogModule } from '../dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.module';
@NgModule({
imports: [
CommonUiModule,
DashboardRoutingModule,
ExportMethodDialogModule,
ConfirmationDialogModule
ConfirmationDialogModule,
DatasetCopyDialogModule
],
declarations: [
DashboardComponent,

2
dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
View File

@ -31,7 +31,7 @@
<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
</div>
<mat-menu #actionsMenu="matMenu">
<button mat-menu-item (click)="openDmpSearchDialogue()" class="menu-item">
<button mat-menu-item (click)="openDmpSearchDialogue(activity.id)" class="menu-item">
<mat-icon>file_copy</mat-icon>{{'DATASET-WIZARD.ACTIONS.COPY-DATASET' | translate}}
</button>
<button mat-menu-item (click)="openConfirm(activity.id)" class="menu-item">

21
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.module.ts Normal file
View File

@ -0,0 +1,21 @@
import { NgModule } from '@angular/core';
import { CommonUiModule } from '@common/ui/common-ui.module';
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
import { CommonFormsModule } from '@common/forms/common-forms.module';
import { DatasetCopyDialogueComponent } from './dataset-copy-dialogue.component';
@NgModule({
imports: [
CommonUiModule,
CommonFormsModule,
AutoCompleteModule
],
declarations: [
DatasetCopyDialogueComponent
],
entryComponents: [
DatasetCopyDialogueComponent
]
})
export class DatasetCopyDialogModule { }

7
dmp-frontend/src/app/ui/dataset/dataset.module.ts
View File

@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
import { ExportMethodDialogModule } from '@app/library/export-method-dialog/export-method-dialog.module';
import { UrlListingModule } from '@app/library/url-listing/url-listing.module';
import { DatasetCopyDialogueComponent } from '@app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component';
import { DatasetEditorComponent } from '@app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component';
import { DatasetWizardComponent } from '@app/ui/dataset/dataset-wizard/dataset-wizard.component';
import { DatasetExternalReferencesEditorComponent } from '@app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component';
@ -23,6 +22,7 @@ import { FormValidationErrorsDialogModule } from '@common/forms/form-validation-
import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
import { CommonUiModule } from '@common/ui/common-ui.module';
import { AngularStickyThingsModule } from '@w11k/angular-sticky-things';
import { DatasetCopyDialogModule } from './dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.module';
@NgModule({
imports: [
@ -37,7 +37,8 @@ import { AngularStickyThingsModule } from '@w11k/angular-sticky-things';
TableOfContentsModule,
AngularStickyThingsModule,
DatasetRoutingModule,
FormValidationErrorsDialogModule
FormValidationErrorsDialogModule,
DatasetCopyDialogModule
],
declarations: [
DatasetListingComponent,
@ -49,7 +50,6 @@ import { AngularStickyThingsModule } from '@w11k/angular-sticky-things';
DatasetExternalDatasetDialogEditorComponent,
DatasetExternalRegistryDialogEditorComponent,
DatasetExternalServiceDialogEditorComponent,
DatasetCopyDialogueComponent,
DatasetUploadDialogue,
DatasetListingItemComponent
],
@ -58,7 +58,6 @@ import { AngularStickyThingsModule } from '@w11k/angular-sticky-things';
DatasetExternalDatasetDialogEditorComponent,
DatasetExternalRegistryDialogEditorComponent,
DatasetExternalServiceDialogEditorComponent,
DatasetCopyDialogueComponent,
DatasetUploadDialogue
]
})

4
dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.html
View File

@ -20,10 +20,8 @@
<mat-datepicker #periodEndPicker></mat-datepicker>
<mat-error>{{'GENERAL.VALIDATION.GRANT-START-AFTER-END' | translate}}</mat-error>
</mat-form-field>
<mat-form-field class="col-10 filter-category">
<mat-select placeholder=" {{ 'CRITERIA.GRANTS.GRANT-STATE-TYPE' | translate}}" [(ngModel)]="criteria.grantStateType" (ngModelChange)="controlModified()">
<mat-select placeholder=" {{ 'CRITERIA.GRANTS.GRANT-STATE-TYPE' | translate}}" [(ngModel)]="criteria.grantStateType" (ngModelChange)="controlModified()" required>
<mat-option [value]="null">
{{ 'CRITERIA.GRANTS.TYPES.NONE' | translate}}
</mat-option>