diff --git a/angular.json b/angular.json index 4c20cd5a82cc75b1ee0b023cb7f2f0ad39f984c9..c2fe0aef95283510043f0b31a96b930ca1715441 100644 --- a/angular.json +++ b/angular.json @@ -32,7 +32,6 @@ "src/yareta-app-theme.scss", "src/styles.scss", "node_modules/primeicons/primeicons.css", - "node_modules/primeng/resources/themes/nova-light/theme.css", "node_modules/primeng/resources/primeng.min.css" ], "scripts": [], @@ -95,7 +94,6 @@ "src/yareta-app-theme.scss", "src/styles.scss", "node_modules/primeicons/primeicons.css", - "node_modules/primeng/resources/themes/nova-light/theme.css", "node_modules/primeng/resources/primeng.min.css" ], "scripts": [], diff --git a/src/app/app.component.html b/src/app/app.component.html index 7937f40be208c0dae6be5fa22f4eb7d78ce7222b..2ce3ca5fa98a64006becab7c5dc663afbfd4761c 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -24,6 +24,4 @@ <router-outlet></router-outlet> -<div class="footer"> - <div class="copyrights">All rights reserved by DLCN and the Univerity of Geneva</div> -</div> +<dlcm-footer></dlcm-footer> diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 782bfcd61da90c11012b42e77a8465b8b6bc774f..9c1ddda79f96549b3151fa5fde6fc98e84d48d0c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -18,17 +18,23 @@ import {environment} from '../environments/environment'; import {AppComponent} from './app.component'; import {AppService} from './app.service'; import {authConfig, authModuleConfig} from './auth.config'; +import {FooterComponent} from './components/footer/footer.component'; import {HomeComponent} from './components/home/home.component'; import {LoginComponent} from './components/login/login.component'; import {PageNotFoundComponent} from './components/page-not-found/page-not-found.component'; import {AppRoutingModule} from './module/app-routing.module'; +const components = [ + AppComponent, + HomeComponent, + PageNotFoundComponent, + LoginComponent, + FooterComponent, +]; + @NgModule({ declarations: [ - AppComponent, - HomeComponent, - PageNotFoundComponent, - LoginComponent, + ...components, ], imports: [ BrowserModule, diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html new file mode 100644 index 0000000000000000000000000000000000000000..bd1392c69d2874d08273d7c178c24275e3d71b91 --- /dev/null +++ b/src/app/components/footer/footer.component.html @@ -0,0 +1,3 @@ +<div class="footer"> + <div class="copyrights">All rights reserved by DLCM and the Univerity of Geneva</div> +</div> diff --git a/src/app/components/footer/footer.component.scss b/src/app/components/footer/footer.component.scss new file mode 100644 index 0000000000000000000000000000000000000000..33e3459a13dc58243e4138261f81fd09e56fbd1e --- /dev/null +++ b/src/app/components/footer/footer.component.scss @@ -0,0 +1,10 @@ +.footer { + position: fixed; + left: 0; + bottom: 0; + width: 100%; + background-color: black; + color: white; + height: 40px; + text-align: center; +} diff --git a/src/app/components/footer/footer.component.spec.ts b/src/app/components/footer/footer.component.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..2ca6c45431d529bbf993d17231e1c7604bb6a480 --- /dev/null +++ b/src/app/components/footer/footer.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FooterComponent } from './footer.component'; + +describe('FooterComponent', () => { + let component: FooterComponent; + let fixture: ComponentFixture<FooterComponent>; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ FooterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FooterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/footer/footer.component.ts b/src/app/components/footer/footer.component.ts new file mode 100644 index 0000000000000000000000000000000000000000..5feb6b9697d03021bed00ea80bbe8050c6481c31 --- /dev/null +++ b/src/app/components/footer/footer.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'dlcm-footer', + templateUrl: './footer.component.html', + styleUrls: ['./footer.component.scss'] +}) +export class FooterComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/deposit/components/table-deposits/table-deposits.component.html b/src/app/deposit/components/table-deposits/table-deposits.component.html index 2bc9b2302990303f3982bfdcb1b4ce2a43ed2dde..9f5bffe8dd093e1a91aba20be6937118d3f8ea68 100644 --- a/src/app/deposit/components/table-deposits/table-deposits.component.html +++ b/src/app/deposit/components/table-deposits/table-deposits.component.html @@ -6,10 +6,10 @@ </th> </tr> </ng-template> - <ng-template pTemplate="body" let-value let-columns="columns"> - <tr> + <ng-template pTemplate="body" let-rowData let-value let-columns="columns"> + <tr pSelectableRow="row"> <td *ngFor="let col of columns"> - {{value[col.field]}} + {{getCellData(rowData, col)}} </td> </tr> </ng-template> diff --git a/src/app/deposit/components/table-deposits/table-deposits.component.ts b/src/app/deposit/components/table-deposits/table-deposits.component.ts index 51d8b89ec49ff20f31a810e030b171b8017a6ae7..25386187038c40705a55e787f6160d40ec196a09 100644 --- a/src/app/deposit/components/table-deposits/table-deposits.component.ts +++ b/src/app/deposit/components/table-deposits/table-deposits.component.ts @@ -22,10 +22,21 @@ export class TableDepositsComponent implements OnInit { this.cols = [ {field: 'title', header: 'Titre'}, {field: 'publicationDate', header: 'Date de publication'}, - {field: 'creation', header: 'Créé le'}, + {field: 'creation.when', header: 'Créé le'}, {field: 'lastUpdate', header: 'Modifié le'}, {field: 'status', header: 'Statut'}, ]; } + + getCellData(row: any, col: any): any { + const nestedProperties: string[] = col.field.split('.'); + let value: any = row; + for (const prop of nestedProperties) { + value = value[prop]; + } + + return value; + } + }