From 2de60df5fd5cf75f4822b8de4213e9122bbb3310 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Fri, 23 Oct 2020 11:29:25 +0300 Subject: [PATCH] added due-date to project add-edit dialog --- apps/red-ui/src/app/app.module.ts | 160 +++++++++--------- .../add-edit-project-dialog.component.html | 14 +- .../add-edit-project-dialog.component.ts | 4 +- apps/red-ui/src/app/icons/icons.module.ts | 2 +- .../project-listing-screen.component.html | 9 +- apps/red-ui/src/assets/i18n/en.json | 3 + .../red-ui/src/assets/icons/general/flash.svg | 4 + 7 files changed, 105 insertions(+), 91 deletions(-) create mode 100644 apps/red-ui/src/assets/icons/general/flash.svg diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 9bafbd1d6..93e591ad6 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -58,6 +58,8 @@ import { RedRoleGuard } from './auth/red-role.guard'; import { MatListModule } from '@angular/material/list'; import { AssignOwnerDialogComponent } from './dialogs/assign-owner-dialog/assign-owner-dialog.component'; import {MatDatepickerModule} from "@angular/material/datepicker"; +import {MatNativeDateModule} from "@angular/material/core"; +import {MatInputModule} from "@angular/material/input"; export function HttpLoaderFactory(httpClient: HttpClient) { return new TranslateHttpLoader(httpClient, '/assets/i18n/', '.json'); @@ -85,87 +87,89 @@ export function HttpLoaderFactory(httpClient: HttpClient) { AnnotationIconComponent, AuthErrorComponent ], - imports: [ - BrowserModule, - BrowserAnimationsModule, - FormsModule, - ReactiveFormsModule, - HttpClientModule, - AuthModule, - IconsModule, - ApiModule, - MatDialogModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useFactory: HttpLoaderFactory, - deps: [HttpClient] + imports: [ + BrowserModule, + BrowserAnimationsModule, + FormsModule, + ReactiveFormsModule, + HttpClientModule, + AuthModule, + IconsModule, + ApiModule, + MatDialogModule, + MatNativeDateModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useFactory: HttpLoaderFactory, + deps: [HttpClient] + } + }), + RouterModule.forRoot([ + { + path: '', + redirectTo: 'ui/projects', + pathMatch: 'full' + }, + { + path: 'auth-error', + component: AuthErrorComponent, + canActivate: [AuthGuard] + }, + { + path: 'ui', + component: BaseScreenComponent, + children: [ + { + path: 'projects', + component: ProjectListingScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] } - }), - RouterModule.forRoot([ - { - path: '', - redirectTo: 'ui/projects', - pathMatch: 'full' - }, - { - path: 'auth-error', - component: AuthErrorComponent, - canActivate: [AuthGuard] - }, - { - path: 'ui', - component: BaseScreenComponent, - children: [ - { - path: 'projects', - component: ProjectListingScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] - } - }, - { - path: 'projects/:projectId', - component: ProjectOverviewScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] - } - }, - { - path: 'projects/:projectId/file/:fileId', - component: FilePreviewScreenComponent, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] - } - } - ] + }, + { + path: 'projects/:projectId', + component: ProjectOverviewScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] } + }, + { + path: 'projects/:projectId/file/:fileId', + component: FilePreviewScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] + } + } + ] + } - ]), - NgpSortModule, - MatToolbarModule, - MatButtonModule, - MatSlideToggleModule, - MatMenuModule, - MatIconModule, - MatTooltipModule, - MatSnackBarModule, - MatTabsModule, - MatButtonToggleModule, - MatFormFieldModule, - ToastrModule.forRoot(), - MatSelectModule, - MatSidenavModule, - FileUploadModule, - ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production}), - MatProgressSpinnerModule, - MatCheckboxModule, - MatListModule, - MatDatepickerModule - ], + ]), + NgpSortModule, + MatToolbarModule, + MatButtonModule, + MatSlideToggleModule, + MatMenuModule, + MatIconModule, + MatTooltipModule, + MatSnackBarModule, + MatTabsModule, + MatButtonToggleModule, + MatFormFieldModule, + ToastrModule.forRoot(), + MatSelectModule, + MatSidenavModule, + FileUploadModule, + ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production}), + MatProgressSpinnerModule, + MatCheckboxModule, + MatListModule, + MatDatepickerModule, + MatInputModule + ], providers: [{ provide: HTTP_INTERCEPTORS, multi: true, diff --git a/apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.html b/apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.html index 532b0489a..a197c3a66 100644 --- a/apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.html +++ b/apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.html @@ -17,14 +17,12 @@ - - - - - - - - + + {{'project-listing.add-edit-dialog.form.due-date.label' | translate}} + + + + diff --git a/apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.ts b/apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.ts index 55254c192..8455027c2 100644 --- a/apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.ts +++ b/apps/red-ui/src/app/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.ts @@ -24,7 +24,7 @@ export class AddEditProjectDialogComponent implements OnInit { this.projectForm = this._formBuilder.group({ projectName: [this.project?.projectName, Validators.required], description: [this.project?.description], - // dueDate: [this.project?.dueDate] + dueDate: [this.project?.dueDate] }); } @@ -40,7 +40,7 @@ export class AddEditProjectDialogComponent implements OnInit { return { projectName: this.projectForm.get('projectName').value, description: this.projectForm.get('description').value, - // dueDate: this.projectForm.get('dueDate').value + dueDate: this.projectForm.get('dueDate').value } } } diff --git a/apps/red-ui/src/app/icons/icons.module.ts b/apps/red-ui/src/app/icons/icons.module.ts index 3520ceb22..cc91cb1a2 100644 --- a/apps/red-ui/src/app/icons/icons.module.ts +++ b/apps/red-ui/src/app/icons/icons.module.ts @@ -18,7 +18,7 @@ export class IconsModule { 'check', 'close', 'document', 'double-chevron-right', 'download', 'edit', 'error', 'folder', 'info', 'lightning', 'logout', 'menu', 'pages', 'plus', 'preview', 'refresh', 'report', 'secret', 'sort-asc', 'sort-desc', - 'status', 'trash', 'user', 'check-alt' + 'status', 'trash', 'user', 'check-alt',"flash" ]; for (const icon of icons) { diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html index 252e280a2..b5c6bc238 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html @@ -31,7 +31,7 @@
- {{'project-listing.table-header.title.label'| translate:{ length: appStateService.allProjects?.length || 0 } }} + {{'project-listing.table-header.title.label'| translate:{length: appStateService.allProjects?.length || 0} }}
@@ -71,7 +71,12 @@ {{userCount(pw)}}
- {{pw.project.date | date:'mediumDate'}}
+ {{pw.project.date | date:'mediumDate'}} +
+
+ + {{pw.project.dueDate | date:'mediumDate'}} +
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 14b537bae..9b3ea77ee 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -216,6 +216,9 @@ }, "name": { "label": "Name" + }, + "due-date": { + "label": "Due Date" } }, "actions": { diff --git a/apps/red-ui/src/assets/icons/general/flash.svg b/apps/red-ui/src/assets/icons/general/flash.svg new file mode 100644 index 000000000..eb030e0ed --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/flash.svg @@ -0,0 +1,4 @@ + + +