Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
This commit is contained in:
commit
4cae214a2c
|
|
@ -45,7 +45,7 @@ const appRoutes: Routes = [
|
|||
},
|
||||
{
|
||||
path: 'plans',
|
||||
loadChildren: () => import('./ui/dmp/dmp.module').then(m => m.DmpModule),
|
||||
loadChildren: () => import('./ui/plan/plan.module').then(m => m.DmpModule),
|
||||
data: {
|
||||
authContext: {
|
||||
permissions: [AppPermission.ViewMyDmpPage]
|
||||
|
|
@ -59,7 +59,7 @@ const appRoutes: Routes = [
|
|||
},
|
||||
{
|
||||
path: 'explore-plans',
|
||||
loadChildren: () => import('./ui/dmp/dmp.module').then(m => m.PublicDmpModule),
|
||||
loadChildren: () => import('./ui/plan/plan.module').then(m => m.PublicDmpModule),
|
||||
data: {
|
||||
breadcrumb: true,
|
||||
...BreadcrumbService.generateRouteDataConfiguration({
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import { ConfigurationService } from '../configuration/configuration.service';
|
|||
import { BaseHttpV2Service } from '../http/base-http-v2.service';
|
||||
import { BaseHttpParams } from '@common/http/base-http-params';
|
||||
import { InterceptorType } from '@common/http/interceptors/interceptor-type';
|
||||
import { DescriptionValidationResult } from '@app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component';
|
||||
import { DescriptionValidationResult } from '@app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component';
|
||||
|
||||
@Injectable()
|
||||
export class DescriptionService {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import { CloneDmpPersist, Dmp, DmpPersist, DmpUser, DmpUserInvitePersist, DmpUse
|
|||
import { AuthService } from '../auth/auth.service';
|
||||
import { ConfigurationService } from '../configuration/configuration.service';
|
||||
import { BaseHttpV2Service } from '../http/base-http-v2.service';
|
||||
import { DmpValidationResult } from '@app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component';
|
||||
import { DmpValidationResult } from '@app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component';
|
||||
import { DmpCommonModelConfig, PreprocessingDmpModel } from '@app/core/model/dmp/dmp-import';
|
||||
|
||||
@Injectable()
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import moment from 'moment';
|
|||
import { CookieService } from 'ngx-cookie-service';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { StartNewDescriptionDialogComponent } from '../description/start-new-description-dialog/start-new-description-dialog.component';
|
||||
import { StartNewDmpDialogComponent } from '../dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component';
|
||||
import { StartNewDmpDialogComponent } from '../plan/new/start-new-plan-dialogue/start-new-plan-dialog.component';
|
||||
import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
|
||||
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ import { DashboardRoutingModule } from '@app/ui/dashboard/dashboard.routing';
|
|||
import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { DescriptionListingModule } from '../description/listing/description-listing.module';
|
||||
import { DmpListingModule } from '../dmp/listing/dmp-listing.module';
|
||||
import { StartNewDmpDialogModule } from '../dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.module';
|
||||
import { DmpListingModule } from '../plan/listing/plan-listing.module';
|
||||
import { StartNewDmpDialogModule } from '../plan/new/start-new-plan-dialogue/start-new-plan-dialog.module';
|
||||
import { RecentEditedActivityComponent } from './recent-edited-activity/recent-edited-activity.component';
|
||||
|
||||
@NgModule({
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
|
|||
import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
|
||||
import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants';
|
||||
import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service';
|
||||
import { StartNewDmpDialogComponent } from '@app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component';
|
||||
import { StartNewDmpDialogComponent } from '@app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component';
|
||||
import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
|
||||
import { PageLoadEvent, SortDirection } from '@common/modules/hybrid-listing/hybrid-listing.component';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import { ReferenceTypeService } from '@app/core/services/reference-type/referenc
|
|||
import { ReferenceService } from '@app/core/services/reference/reference.service';
|
||||
import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
|
||||
import { FileUtils } from '@app/core/services/utilities/file-utils.service';
|
||||
import { DmpInvitationDialogComponent } from '@app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component';
|
||||
import { DmpInvitationDialogComponent } from '@app/ui/plan/invitation/dialog/plan-invitation-dialog.component';
|
||||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
|
||||
import { Guid } from '@common/types/guid';
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ import { UserService } from '@app/core/services/user/user.service';
|
|||
import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
|
||||
import { FileUtils } from '@app/core/services/utilities/file-utils.service';
|
||||
import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component';
|
||||
import { DescriptionValidationOutput } from '@app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component';
|
||||
import { DmpInvitationDialogComponent } from '@app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component';
|
||||
import { DescriptionValidationOutput } from '@app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component';
|
||||
import { DmpInvitationDialogComponent } from '@app/ui/plan/invitation/dialog/plan-invitation-dialog.component';
|
||||
import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service';
|
||||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import { MineInAppNotificationListingDialogComponent } from '@notification-servi
|
|||
import { timer } from 'rxjs';
|
||||
import { map, takeUntil } from 'rxjs/operators';
|
||||
import { nameof } from 'ts-simple-nameof';
|
||||
import { StartNewDmpDialogComponent } from '../dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component';
|
||||
import { StartNewDmpDialogComponent } from '../plan/new/start-new-plan-dialogue/start-new-plan-dialog.component';
|
||||
import { FaqDialogComponent } from '../faq/dialog/faq-dialog.component';
|
||||
import { UserDialogComponent } from './user-dialog/user-dialog.component';
|
||||
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv
|
|||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { DmpCloneDialogEditorModel } from './dmp-clone-dialog.editor.model';
|
||||
import { DmpEditorEntityResolver } from '../dmp-editor-blueprint/resolvers/dmp-editor-enitity.resolver';
|
||||
import { DmpCloneDialogEditorModel } from './plan-clone-dialog.editor.model';
|
||||
import { DmpEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver';
|
||||
import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
|
||||
import { HttpErrorResponse } from '@angular/common/http';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-clone-dialog',
|
||||
templateUrl: './dmp-clone-dialog.component.html',
|
||||
styleUrls: ['./dmp-clone-dialog.component.scss']
|
||||
selector: 'app-plan-clone-dialog',
|
||||
templateUrl: './plan-clone-dialog.component.html',
|
||||
styleUrls: ['./plan-clone-dialog.component.scss']
|
||||
})
|
||||
export class CloneDmpDialogComponent extends BaseComponent {
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { CloneDmpDialogComponent } from './dmp-clone-dialog.component';
|
||||
import { CloneDmpDialogComponent } from './plan-clone-dialog.component';
|
||||
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
|
||||
import {RichTextEditorModule} from "@app/library/rich-text-editor/rich-text-editor.module";
|
||||
|
||||
|
|
@ -20,9 +20,9 @@ import { takeUntil } from 'rxjs/operators';
|
|||
import { nameof } from 'ts-simple-nameof';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-deposit-dropdown',
|
||||
templateUrl: './dmp-deposit-dropdown.component.html',
|
||||
styleUrls: ['./dmp-deposit-dropdown.component.scss']
|
||||
selector: 'app-plan-deposit-dropdown',
|
||||
templateUrl: './plan-deposit-dropdown.component.html',
|
||||
styleUrls: ['./plan-deposit-dropdown.component.scss']
|
||||
})
|
||||
export class DmpDepositDropdown extends BaseComponent implements OnInit {
|
||||
@Input() inputRepos: DepositConfiguration[];
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { AuthService } from '@app/core/services/auth/auth.service';
|
||||
import { DmpInvitationService } from '@app/core/services/dmp/dmp-invitation.service';
|
||||
import { DmpInvitationService } from '@app/core/services/plan/dmp-invitation.service';
|
||||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
</div>
|
||||
<div mat-dialog-content class="row">
|
||||
<div>
|
||||
<app-dmp-user-field-component [form]="formGroup" [validationErrorModel]="editorModel.validationErrorModel" [sections]="selectedBlueprint.definition.sections" [viewOnly]="false" [initializeUsers]="true" [enableSorting]="false"></app-dmp-user-field-component>
|
||||
<app-plan-user-field-component [form]="formGroup" [validationErrorModel]="editorModel.validationErrorModel" [sections]="selectedBlueprint.definition.sections" [viewOnly]="false" [initializeUsers]="true" [enableSorting]="false"></app-plan-user-field-component>
|
||||
</div>
|
||||
<div class="col mt-2">
|
||||
<button mat-raised-button *ngIf="hasValue()" [disabled]="inProgressSendButton" (click)="send()" type="button" class="invite-btn">{{'DMP-USER-INVITATION-DIALOG.ACTIONS.INVITE' | translate}}</button>
|
||||
|
|
@ -17,12 +17,12 @@ import { HttpError, HttpErrorHandlingService } from '@common/modules/errors/erro
|
|||
import { Guid } from '@common/types/guid';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { DmpEditorModel } from '../../dmp-editor-blueprint/dmp-editor.model';
|
||||
import { DmpEditorModel } from '../../plan-editor-blueprint/plan-editor.model';
|
||||
|
||||
@Component({
|
||||
selector: 'app-invitation-dialog-component',
|
||||
templateUrl: 'dmp-invitation-dialog.component.html',
|
||||
styleUrls: ['./dmp-invitation-dialog.component.scss']
|
||||
templateUrl: 'plan-invitation-dialog.component.html',
|
||||
styleUrls: ['./plan-invitation-dialog.component.scss']
|
||||
})
|
||||
export class DmpInvitationDialogComponent extends BaseComponent implements OnInit {
|
||||
|
||||
|
|
@ -3,8 +3,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
|||
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
|
||||
import { RichTextEditorModule } from "@app/library/rich-text-editor/rich-text-editor.module";
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { DmpInvitationDialogComponent } from './dmp-invitation-dialog.component';
|
||||
import { DmpUserFieldModule } from '../../dmp-user-field/dmp-user-field.module';
|
||||
import { DmpInvitationDialogComponent } from './plan-invitation-dialog.component';
|
||||
import { DmpUserFieldModule } from '../../plan-user-field/plan-user-field.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule, DmpUserFieldModule],
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<a class="col-auto d-flex pointer" (click)="onClose()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
|
||||
<app-dmp-filter-component
|
||||
<app-plan-filter-component
|
||||
[filterFormGroup]="data.filterForm"
|
||||
[referencesWithTypeItems]="data.referencesWithTypeItems"
|
||||
[isPublic]="data.isPublic"
|
||||
(filterChanged)="onFilterChanged($event)"
|
||||
></app-dmp-filter-component>
|
||||
></app-plan-filter-component>
|
||||
|
|
@ -2,13 +2,13 @@ import { Inject, Component, ViewChild, OnInit } from '@angular/core';
|
|||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||
import { UntypedFormGroup } from '@angular/forms';
|
||||
import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
|
||||
import { DmpFilterComponent } from '../dmp-filter.component';
|
||||
import { DmpFilterComponent } from '../plan-filter.component';
|
||||
import { ReferencesWithType } from '@app/core/query/description.lookup';
|
||||
|
||||
@Component({
|
||||
selector: 'dmp-filter-dialog-component',
|
||||
templateUrl: './dmp-filter-dialog.component.html',
|
||||
styleUrls: ['./dmp-filter-dialog.component.scss']
|
||||
selector: 'plan-filter-dialog-component',
|
||||
templateUrl: './plan-filter-dialog.component.html',
|
||||
styleUrls: ['./plan-filter-dialog.component.scss']
|
||||
})
|
||||
|
||||
export class DmpFilterDialogComponent implements OnInit {
|
||||
|
|
@ -23,9 +23,9 @@ import { QueryResult } from '@common/model/query-result';
|
|||
import { ReferencesWithType } from '@app/core/query/description.lookup';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-filter-component',
|
||||
templateUrl: './dmp-filter.component.html',
|
||||
styleUrls: ['./dmp-filter.component.scss'],
|
||||
selector: 'app-plan-filter-component',
|
||||
templateUrl: './plan-filter.component.html',
|
||||
styleUrls: ['./plan-filter.component.scss'],
|
||||
})
|
||||
export class DmpFilterComponent extends BaseCriteriaComponent implements OnInit, OnChanges {
|
||||
|
||||
|
|
@ -21,21 +21,21 @@ import { TranslateService } from '@ngx-translate/core';
|
|||
import { takeUntil } from 'rxjs/operators';
|
||||
import { DmpStatus } from '../../../../core/common/enum/dmp-status';
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { CloneDmpDialogComponent } from '../../clone-dialog/dmp-clone-dialog.component';
|
||||
import { DmpInvitationDialogComponent } from '../../invitation/dialog/dmp-invitation-dialog.component';
|
||||
import { NewVersionDmpDialogComponent } from '../../new-version-dialog/dmp-new-version-dialog.component';
|
||||
import { CloneDmpDialogComponent } from '../../clone-dialog/plan-clone-dialog.component';
|
||||
import { DmpInvitationDialogComponent } from '../../invitation/dialog/plan-invitation-dialog.component';
|
||||
import { NewVersionDmpDialogComponent } from '../../new-version-dialog/plan-new-version-dialog.component';
|
||||
import { AppPermission } from '@app/core/common/enum/permission.enum';
|
||||
import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type';
|
||||
import { DmpVersionStatus } from '@app/core/common/enum/dmp-version-status';
|
||||
import { DmpDeleteDialogComponent } from '../../dmp-delete-dialog/dmp-delete-dialog.component';
|
||||
import { DmpDeleteDialogComponent } from '../../plan-delete-dialog/plan-delete-dialog.component';
|
||||
import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
|
||||
import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
|
||||
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-listing-item-component',
|
||||
templateUrl: './dmp-listing-item.component.html',
|
||||
styleUrls: ['./dmp-listing-item.component.scss'],
|
||||
templateUrl: './plan-listing-item.component.html',
|
||||
styleUrls: ['./plan-listing-item.component.scss'],
|
||||
})
|
||||
export class DmpListingItemComponent extends BaseComponent implements OnInit {
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ import { TranslateService } from '@ngx-translate/core';
|
|||
import { NgDialogAnimationService } from "ng-dialog-animation";
|
||||
import { debounceTime, takeUntil, tap } from 'rxjs/operators';
|
||||
import { nameof } from 'ts-simple-nameof';
|
||||
import { DmpFilterDialogComponent } from './filtering/dmp-filter-dialog/dmp-filter-dialog.component';
|
||||
import { DmpFilterDialogComponent } from './filtering/plan-filter-dialog/plan-filter-dialog.component';
|
||||
import { BaseListingComponent } from '@common/base/base-listing-component';
|
||||
import { QueryResult } from '@common/model/query-result';
|
||||
import { Observable } from 'rxjs';
|
||||
|
|
@ -35,12 +35,12 @@ import { UiNotificationService } from '@app/core/services/notification/ui-notifi
|
|||
import { QueryParamsService } from '@app/core/services/utilities/query-params.service';
|
||||
import { ReferencesWithType } from '@app/core/query/description.lookup';
|
||||
import { Guid } from '@common/types/guid';
|
||||
import { DmpFilterService } from './filtering/services/dmp-filter.service';
|
||||
import { DmpFilterService } from './filtering/services/plan-filter.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-listing-component',
|
||||
templateUrl: 'dmp-listing.component.html',
|
||||
styleUrls: ['./dmp-listing.component.scss'],
|
||||
selector: 'app-plan-listing-component',
|
||||
templateUrl: 'plan-listing.component.html',
|
||||
styleUrls: ['./plan-listing.component.scss'],
|
||||
})
|
||||
export class DmpListingComponent extends BaseListingComponent<BaseDmp, DmpLookup> implements OnInit {
|
||||
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { FormattingModule } from '@app/core/formatting.module';
|
||||
import { DmpListingComponent } from '@app/ui/dmp/listing/dmp-listing.component';
|
||||
import { DmpListingItemComponent } from '@app/ui/dmp/listing/listing-item/dmp-listing-item.component';
|
||||
import { CommonFormsModule } from '@common/forms/common-forms.module';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { CloneDmpDialogModule } from '../clone-dialog/dmp-clone-dialog.module';
|
||||
import { NewVersionDmpDialogModule } from '../new-version-dialog/dmp-new-version-dialog.module';
|
||||
import { DmpListingRoutingModule } from './dmp-listing.routing';
|
||||
import { DmpInvitationDialogModule } from '../invitation/dialog/dmp-invitation-dialog.module';
|
||||
import { DmpFilterDialogComponent } from './filtering/dmp-filter-dialog/dmp-filter-dialog.component';
|
||||
import { DmpFilterComponent } from './filtering/dmp-filter.component';
|
||||
import { NewVersionDmpDialogModule } from '../new-version-dialog/plan-new-version-dialog.module';
|
||||
import { DmpInvitationDialogModule } from '../invitation/dialog/plan-invitation-dialog.module';
|
||||
import { DmpFilterDialogComponent } from './filtering/plan-filter-dialog/plan-filter-dialog.component';
|
||||
import { DmpFilterComponent } from './filtering/plan-filter.component';
|
||||
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
|
||||
import { DmpFilterService } from './filtering/services/dmp-filter.service';
|
||||
import { DmpFilterService } from './filtering/services/plan-filter.service';
|
||||
import { CloneDmpDialogModule } from '../clone-dialog/plan-clone-dialog.module';
|
||||
import { DmpListingComponent } from './plan-listing.component';
|
||||
import { DmpListingItemComponent } from './listing-item/plan-listing-item.component';
|
||||
import { DmpListingRoutingModule } from './plan-listing.routing';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { DmpListingComponent } from './dmp-listing.component';
|
||||
import { DmpListingComponent } from './plan-listing.component';
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
|
|
@ -7,9 +7,9 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv
|
|||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { map, takeUntil } from 'rxjs/operators';
|
||||
import { DmpNewVersionDialogEditorModel } from './dmp-new-version-dialog.editor.model';
|
||||
import { DmpNewVersionDialogEditorModel } from './plan-new-version-dialog.editor.model';
|
||||
import { DmpBlueprintService } from '@app/core/services/dmp/dmp-blueprint.service';
|
||||
import { DmpEditorEntityResolver } from '../dmp-editor-blueprint/resolvers/dmp-editor-enitity.resolver';
|
||||
import { DmpEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver';
|
||||
import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration';
|
||||
import { DescriptionTemplatesInSection, DmpBlueprint, DmpBlueprintDefinition, DmpBlueprintDefinitionSection } from '@app/core/model/dmp-blueprint/dmp-blueprint';
|
||||
import { DmpBlueprintStatus } from '@app/core/common/enum/dmp-blueprint-status';
|
||||
|
|
@ -26,9 +26,9 @@ import { HttpErrorResponse } from '@angular/common/http';
|
|||
import { Description } from '@app/core/model/description/description';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-new-version-dialog',
|
||||
templateUrl: './dmp-new-version-dialog.component.html',
|
||||
styleUrls: ['./dmp-new-version-dialog.component.scss']
|
||||
selector: 'app-plan-new-version-dialog',
|
||||
templateUrl: './plan-new-version-dialog.component.html',
|
||||
styleUrls: ['./plan-new-version-dialog.component.scss']
|
||||
})
|
||||
export class NewVersionDmpDialogComponent extends BaseComponent {
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
|||
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
|
||||
import { RichTextEditorModule } from "@app/library/rich-text-editor/rich-text-editor.module";
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { NewVersionDmpDialogComponent } from './dmp-new-version-dialog.component';
|
||||
import { NewVersionDmpDialogComponent } from './plan-new-version-dialog.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule],
|
||||
|
|
@ -7,14 +7,14 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv
|
|||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { DmpUploadDialogComponent } from '../upload-dialogue/dmp-upload-dialog.component';
|
||||
import { DmpUploadDialogComponent } from '../upload-dialogue/plan-upload-dialog.component';
|
||||
import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
|
||||
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-start-new-dmp',
|
||||
templateUrl: './start-new-dmp-dialog.component.html',
|
||||
styleUrls: ['./start-new-dmp-dialog.component.scss']
|
||||
selector: 'app-start-new-plan',
|
||||
templateUrl: './start-new-plan-dialog.component.html',
|
||||
styleUrls: ['./start-new-plan-dialog.component.scss']
|
||||
})
|
||||
export class StartNewDmpDialogComponent extends BaseComponent {
|
||||
|
||||
|
|
@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
|
|||
import { FormattingModule } from '@app/core/formatting.module';
|
||||
import { CommonFormsModule } from '@common/forms/common-forms.module';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { DmpUploadDialogModule } from '../upload-dialogue/dmp-upload-dialog.module';
|
||||
import { StartNewDmpDialogComponent } from './start-new-dmp-dialog.component';
|
||||
import { DmpUploadDialogModule } from '../upload-dialogue/plan-upload-dialog.module';
|
||||
import { StartNewDmpDialogComponent } from './start-new-plan-dialog.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -8,7 +8,7 @@ import { DmpService } from '@app/core/services/dmp/dmp.service';
|
|||
import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
|
||||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { map, takeUntil } from 'rxjs/operators';
|
||||
import { DmpImportRdaConfigEditorModel } from './dmp-common-model-config.editor.model';
|
||||
import { DmpImportRdaConfigEditorModel } from './plan-common-model-config.editor.model';
|
||||
import { UntypedFormArray, UntypedFormGroup } from '@angular/forms';
|
||||
import { DescriptionTemplateService } from '@app/core/services/description-template/description-template.service';
|
||||
import { FormService } from '@common/forms/form-service';
|
||||
|
|
@ -20,9 +20,9 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv
|
|||
import { TranslateService } from '@ngx-translate/core';
|
||||
|
||||
@Component({
|
||||
selector: 'dmp-upload-dialog',
|
||||
templateUrl: './dmp-upload-dialog.component.html',
|
||||
styleUrls: ['./dmp-upload-dialog.component.scss']
|
||||
selector: 'plan-upload-dialog',
|
||||
templateUrl: './plan-upload-dialog.component.html',
|
||||
styleUrls: ['./plan-upload-dialog.component.scss']
|
||||
})
|
||||
export class DmpUploadDialogComponent extends BaseComponent {
|
||||
dmpTitle: string;
|
||||
|
|
@ -3,7 +3,7 @@ import { FormattingModule } from '@app/core/formatting.module';
|
|||
import { CommonFormsModule } from '@common/forms/common-forms.module';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { NgxDropzoneModule } from 'ngx-dropzone';
|
||||
import { DmpUploadDialogComponent } from './dmp-upload-dialog.component';
|
||||
import { DmpUploadDialogComponent } from './plan-upload-dialog.component';
|
||||
import { ReactiveFormsModule } from '@angular/forms';
|
||||
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
|
||||
|
||||
|
|
@ -43,18 +43,18 @@ import { Guid } from '@common/types/guid';
|
|||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { map, takeUntil } from 'rxjs/operators';
|
||||
import { nameof } from 'ts-simple-nameof';
|
||||
import { CloneDmpDialogComponent } from '../clone-dialog/dmp-clone-dialog.component';
|
||||
import { DmpDeleteDialogComponent } from '../dmp-delete-dialog/dmp-delete-dialog.component';
|
||||
import { DmpEditorEntityResolver } from '../dmp-editor-blueprint/resolvers/dmp-editor-enitity.resolver';
|
||||
import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../dmp-finalize-dialog/dmp-finalize-dialog.component';
|
||||
import { DmpInvitationDialogComponent } from '../invitation/dialog/dmp-invitation-dialog.component';
|
||||
import { NewVersionDmpDialogComponent } from '../new-version-dialog/dmp-new-version-dialog.component';
|
||||
import { CloneDmpDialogComponent } from '../clone-dialog/plan-clone-dialog.component';
|
||||
import { DmpDeleteDialogComponent } from '../plan-delete-dialog/plan-delete-dialog.component';
|
||||
import { DmpEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver';
|
||||
import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../plan-finalize-dialog/plan-finalize-dialog.component';
|
||||
import { DmpInvitationDialogComponent } from '../invitation/dialog/plan-invitation-dialog.component';
|
||||
import { NewVersionDmpDialogComponent } from '../new-version-dialog/plan-new-version-dialog.component';
|
||||
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-overview',
|
||||
templateUrl: './dmp-overview.component.html',
|
||||
styleUrls: ['./dmp-overview.component.scss']
|
||||
templateUrl: './plan-overview.component.html',
|
||||
styleUrls: ['./plan-overview.component.scss']
|
||||
})
|
||||
export class DmpOverviewComponent extends BaseComponent implements OnInit {
|
||||
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { FormattingModule } from '@app/core/formatting.module';
|
||||
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
|
||||
import { DmpDepositDropdown } from "@app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component";
|
||||
import { DmpOverviewComponent } from '@app/ui/dmp/overview/dmp-overview.component';
|
||||
import { DmpDepositDropdown } from '../editor/plan-deposit-dropdown/plan-deposit-dropdown.component';
|
||||
import { CommonFormsModule } from '@common/forms/common-forms.module';
|
||||
import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { NgDialogAnimationService } from 'ng-dialog-animation';
|
||||
import { DmpFinalizeDialogModule } from '../dmp-finalize-dialog/dmp-finalize-dialog.module';
|
||||
import { DmpOverviewRoutingModule } from './dmp-overview.routing';
|
||||
import { DmpFinalizeDialogModule } from '../plan-finalize-dialog/plan-finalize-dialog.module';
|
||||
import { DmpOverviewRoutingModule } from './plan-overview.routing';
|
||||
import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
|
||||
import { DmpDeleteDialogModule } from '../dmp-delete-dialog/dmp-delete-dialog.module';
|
||||
import { DmpDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module';
|
||||
import { DmpOverviewComponent } from './plan-overview.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { DmpOverviewComponent } from './dmp-overview.component';
|
||||
import { DmpOverviewComponent } from './plan-overview.component';
|
||||
import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service';
|
||||
|
||||
const routes: Routes = [
|
||||
|
|
@ -6,15 +6,15 @@ import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/sing
|
|||
import { map } from 'rxjs';
|
||||
import { DmpAssociatedUser } from '@app/core/model/user/user';
|
||||
import { UntypedFormGroup } from '@angular/forms';
|
||||
import { DmpContactPrefillDialogEditorModel } from './dmp-contact-prefill-dialog.editor.model';
|
||||
import { DmpContactPrefillDialogEditorModel } from './plan-contact-prefill-dialog.editor.model';
|
||||
import { FormService } from '@common/forms/form-service';
|
||||
import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
|
||||
import { DmpBlueprintSystemFieldType } from '@app/core/common/enum/dmp-blueprint-system-field-type';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-contact-prefill-dialog',
|
||||
templateUrl: './dmp-contact-prefill-dialog.component.html',
|
||||
styleUrls: ['./dmp-contact-prefill-dialog.component.scss']
|
||||
selector: 'app-plan-contact-prefill-dialog',
|
||||
templateUrl: './plan-contact-prefill-dialog.component.html',
|
||||
styleUrls: ['./plan-contact-prefill-dialog.component.scss']
|
||||
})
|
||||
export class DmpContactPrefillDialogComponent extends BaseComponent {
|
||||
|
||||
|
|
@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
|
|||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
|
||||
import { DmpContactPrefillDialogComponent } from './dmp-contact-prefill-dialog.component';
|
||||
import { DmpContactPrefillDialogComponent } from './plan-contact-prefill-dialog.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule],
|
||||
|
|
@ -3,9 +3,9 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
|||
import { Description } from '@app/core/model/description/description';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-delete-dialog',
|
||||
templateUrl: './dmp-delete-dialog.component.html',
|
||||
styleUrls: ['./dmp-delete-dialog.component.scss']
|
||||
selector: 'app-plan-delete-dialog',
|
||||
templateUrl: './plan-delete-dialog.component.html',
|
||||
styleUrls: ['./plan-delete-dialog.component.scss']
|
||||
})
|
||||
export class DmpDeleteDialogComponent {
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { DmpDeleteDialogComponent } from './dmp-delete-dialog.component';
|
||||
import { DmpDeleteDialogComponent } from './plan-delete-dialog.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [CommonUiModule, FormsModule],
|
||||
|
|
@ -5,9 +5,9 @@ import { BaseComponent } from '@common/base/base.component';
|
|||
import { takeUntil } from 'rxjs/operators';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-form-progress-indication',
|
||||
templateUrl: './dmp-form-progress-indication.component.html',
|
||||
styleUrls: ['./dmp-form-progress-indication.component.scss']
|
||||
selector: 'app-plan-form-progress-indication',
|
||||
templateUrl: './plan-form-progress-indication.component.html',
|
||||
styleUrls: ['./plan-form-progress-indication.component.scss']
|
||||
})
|
||||
export class DmpFormProgressIndicationComponent extends BaseComponent implements OnInit, OnChanges {
|
||||
@Input() formGroup: UntypedFormGroup;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonFormsModule } from '@common/forms/common-forms.module';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { DmpFormProgressIndicationComponent } from './dmp-form-progress-indication.component';
|
||||
import { DmpFormProgressIndicationComponent } from './plan-form-progress-indication.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -308,7 +308,7 @@
|
|||
</div>
|
||||
<div *ngIf="field.systemFieldType == dmpBlueprintSystemFieldTypeEnum.User">
|
||||
<div>
|
||||
<app-dmp-user-field-component [form]="formGroup" [validationErrorModel]="editorModel.validationErrorModel" [sections]="selectedBlueprint.definition.sections" [viewOnly]="formGroup.disabled || !canEdit"></app-dmp-user-field-component> </div>
|
||||
<app-plan-user-field-component [form]="formGroup" [validationErrorModel]="editorModel.validationErrorModel" [sections]="selectedBlueprint.definition.sections" [viewOnly]="formGroup.disabled || !canEdit"></app-plan-user-field-component> </div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="field.category === dmpBlueprintSectionFieldCategoryEnum.ReferenceType">
|
||||
|
|
@ -48,19 +48,19 @@ import { FilterService } from '@common/modules/text-filter/filter-service';
|
|||
import { Guid } from '@common/types/guid';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { map, takeUntil } from 'rxjs/operators';
|
||||
import { DmpContactPrefillDialogComponent } from '../dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component';
|
||||
import { DmpEditorModel, DmpFieldIndicator } from './dmp-editor.model';
|
||||
import { DmpEditorEntityResolver } from './resolvers/dmp-editor-enitity.resolver';
|
||||
import { DmpEditorService } from './dmp-editor.service';
|
||||
import { DmpContactPrefillDialogComponent } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.component';
|
||||
import { DmpEditorModel, DmpFieldIndicator } from './plan-editor.model';
|
||||
import { DmpEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver';
|
||||
import { DmpEditorService } from './plan-editor.service';
|
||||
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
|
||||
import { FileTransformerService } from '@app/core/services/file-transformer/file-transformer.service';
|
||||
import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type';
|
||||
import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../dmp-finalize-dialog/dmp-finalize-dialog.component';
|
||||
import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../plan-finalize-dialog/plan-finalize-dialog.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-editor',
|
||||
templateUrl: './dmp-editor.component.html',
|
||||
styleUrls: ['./dmp-editor.component.scss'],
|
||||
selector: 'app-plan-editor',
|
||||
templateUrl: './plan-editor.component.html',
|
||||
styleUrls: ['./plan-editor.component.scss'],
|
||||
providers: [DmpEditorService]
|
||||
})
|
||||
export class DmpEditorComponent extends BaseEditor<DmpEditorModel, Dmp> implements OnInit {
|
||||
|
|
@ -7,12 +7,12 @@ import { ReferenceFieldModule } from '@app/ui/reference/reference-field/referenc
|
|||
import { CommonFormsModule } from '@common/forms/common-forms.module';
|
||||
import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { DmpUserFieldModule } from '../dmp-user-field/dmp-user-field.module';
|
||||
import { DmpEditorComponent } from './dmp-editor.component';
|
||||
import { DmpEditorRoutingModule } from './dmp-editor.routing';
|
||||
import { DmpFormProgressIndicationModule } from './form-progress-indication/dmp-form-progress-indication.module';
|
||||
import { DmpDeleteDialogModule } from '../dmp-delete-dialog/dmp-delete-dialog.module';
|
||||
import { DmpContactPrefillDialogModule } from '../dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.module';
|
||||
import { DmpUserFieldModule } from '../plan-user-field/plan-user-field.module';
|
||||
import { DmpEditorComponent } from './plan-editor.component';
|
||||
import { DmpEditorRoutingModule } from './plan-editor.routing';
|
||||
import { DmpFormProgressIndicationModule } from './form-progress-indication/plan-form-progress-indication.module';
|
||||
import { DmpDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module';
|
||||
import { DmpContactPrefillDialogModule } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -5,9 +5,9 @@ import { AppPermission } from '@app/core/common/enum/permission.enum';
|
|||
import { PendingChangesGuard } from '@common/forms/pending-form-changes/pending-form-changes-guard.service';
|
||||
// import { DmpOverviewComponent } from './overview/description-overview.component';
|
||||
import { AuthGuard } from '@app/core/auth-guard.service';
|
||||
import { DmpEditorComponent } from './dmp-editor.component';
|
||||
import { DmpEditorEntityResolver } from './resolvers/dmp-editor-enitity.resolver';
|
||||
import { DmpEditorPermissionsResolver } from './resolvers/dmp-editor-permissions.resolver';
|
||||
import { DmpEditorComponent } from './plan-editor.component';
|
||||
import { DmpEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver';
|
||||
import { DmpEditorPermissionsResolver } from './resolvers/plan-editor-permissions.resolver';
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
|
|
@ -8,7 +8,7 @@ import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service';
|
|||
import { BaseEditorResolver } from '@common/base/base-editor.resolver';
|
||||
import { Guid } from '@common/types/guid';
|
||||
import { mergeMap, takeUntil, tap } from 'rxjs/operators';
|
||||
import { DmpEditorEntityResolver } from './dmp-editor-enitity.resolver';
|
||||
import { DmpEditorEntityResolver } from './plan-editor-enitity.resolver';
|
||||
|
||||
@Injectable()
|
||||
export class DmpEditorPermissionsResolver extends BaseEditorResolver {
|
||||
|
|
@ -13,9 +13,9 @@ import { takeUntil } from 'rxjs/operators';
|
|||
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-finalize-dialog-component',
|
||||
templateUrl: 'dmp-finalize-dialog.component.html',
|
||||
styleUrls: ['./dmp-finalize-dialog.component.scss']
|
||||
selector: 'app-plan-finalize-dialog-component',
|
||||
templateUrl: 'plan-finalize-dialog.component.html',
|
||||
styleUrls: ['./plan-finalize-dialog.component.scss']
|
||||
})
|
||||
export class DmpFinalizeDialogComponent extends BaseComponent implements OnInit {
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
|||
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
|
||||
import { RichTextEditorModule } from "@app/library/rich-text-editor/rich-text-editor.module";
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { DmpFinalizeDialogComponent } from './dmp-finalize-dialog.component';
|
||||
import { DmpFinalizeDialogComponent } from './plan-finalize-dialog.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule],
|
||||
|
|
@ -9,13 +9,13 @@ import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
|
|||
import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration';
|
||||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
|
||||
import { DmpEditorModel, DmpUserEditorModel } from '../dmp-editor-blueprint/dmp-editor.model';
|
||||
import { DmpEditorModel, DmpUserEditorModel } from '../plan-editor-blueprint/plan-editor.model';
|
||||
import { MatButtonToggleChange } from '@angular/material/button-toggle';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-user-field-component',
|
||||
templateUrl: 'dmp-user-field.component.html',
|
||||
styleUrls: ['./dmp-user-field.component.scss']
|
||||
selector: 'app-plan-user-field-component',
|
||||
templateUrl: 'plan-user-field.component.html',
|
||||
styleUrls: ['./plan-user-field.component.scss']
|
||||
})
|
||||
export class DmpUserFieldComponent extends BaseComponent implements OnInit {
|
||||
|
||||
|
|
@ -5,7 +5,7 @@ import { CommonFormsModule } from '@common/forms/common-forms.module';
|
|||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { DragDropModule } from '@angular/cdk/drag-drop';
|
||||
import { NgxDropzoneModule } from "ngx-dropzone";
|
||||
import { DmpUserFieldComponent } from './dmp-user-field.component';
|
||||
import { DmpUserFieldComponent } from './plan-user-field.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { FormattingModule } from '@app/core/formatting.module';
|
||||
import { DmpRoutingModule, PublicDmpRoutingModule } from '@app/ui/dmp/dmp.routing';
|
||||
import { DmpRoutingModule, PublicDmpRoutingModule } from '@app/ui/plan/plan.routing';
|
||||
import { CommonFormsModule } from '@common/forms/common-forms.module';
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ import { AuthGuard } from '@app/core/auth-guard.service';
|
|||
const routes: Routes = [
|
||||
{
|
||||
path: 'overview',
|
||||
loadChildren: () => import('./overview/dmp-overview.module').then(m => m.DmpOverviewModule),
|
||||
loadChildren: () => import('./overview/plan-overview.module').then(m => m.DmpOverviewModule),
|
||||
canActivate:[AuthGuard],
|
||||
data: {
|
||||
breadcrumb: true,
|
||||
|
|
@ -17,7 +17,7 @@ const routes: Routes = [
|
|||
},
|
||||
{
|
||||
path: 'new',
|
||||
loadChildren: () => import('./dmp-editor-blueprint/dmp-editor.module').then(m => m.DmpEditorModule),
|
||||
loadChildren: () => import('./plan-editor-blueprint/plan-editor.module').then(m => m.DmpEditorModule),
|
||||
canActivate:[AuthGuard],
|
||||
data: {
|
||||
breadcrumb: true,
|
||||
|
|
@ -29,7 +29,7 @@ const routes: Routes = [
|
|||
},
|
||||
{
|
||||
path: 'edit',
|
||||
loadChildren: () => import('./dmp-editor-blueprint/dmp-editor.module').then(m => m.DmpEditorModule),
|
||||
loadChildren: () => import('./plan-editor-blueprint/plan-editor.module').then(m => m.DmpEditorModule),
|
||||
canActivate:[AuthGuard],
|
||||
data: {
|
||||
breadcrumb: true,
|
||||
|
|
@ -42,7 +42,7 @@ const routes: Routes = [
|
|||
{
|
||||
path: '',
|
||||
canActivate:[AuthGuard],
|
||||
loadChildren: () => import('./listing/dmp-listing.module').then(m => m.DmpListingModule),
|
||||
loadChildren: () => import('./listing/plan-listing.module').then(m => m.DmpListingModule),
|
||||
data: {
|
||||
breadcrumb: true
|
||||
},
|
||||
|
|
@ -52,7 +52,7 @@ const routes: Routes = [
|
|||
const publicRoutes: Routes = [
|
||||
{
|
||||
path: 'overview',
|
||||
loadChildren: () => import('./overview/dmp-overview.module').then(m => m.DmpOverviewModule),
|
||||
loadChildren: () => import('./overview/plan-overview.module').then(m => m.DmpOverviewModule),
|
||||
data: {
|
||||
breadcrumb: true,
|
||||
...BreadcrumbService.generateRouteDataConfiguration({
|
||||
|
|
@ -62,7 +62,7 @@ const publicRoutes: Routes = [
|
|||
},
|
||||
{
|
||||
path: '',
|
||||
loadChildren: () => import('./listing/dmp-listing.module').then(m => m.DmpListingModule),
|
||||
loadChildren: () => import('./listing/plan-listing.module').then(m => m.DmpListingModule),
|
||||
data: {
|
||||
breadcrumb: true,
|
||||
isPublic: true
|
||||
Loading…
Reference in New Issue