diff --git a/.gitignore b/.gitignore index 0711527..edaadea 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,14 @@ yarn-error.log testem.log /typings +# e2e +/e2e/*.js +/e2e/*.map + # System files .DS_Store Thumbs.db + +**/*.copy.ts +**/*.copy.scss +**/*.copy.html diff --git a/angular.json b/angular.json index 10251d7..65c1691 100644 --- a/angular.json +++ b/angular.json @@ -23,10 +23,10 @@ "outputPath": "dist/headup_app", "index": "src/index.html", "main": "src/main.ts", + "tsConfig": "tsconfig.app.json", "polyfills": [ "zone.js" ], - "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", "assets": [ "src/favicon.ico", @@ -36,10 +36,23 @@ "styles": [ "src/styles/styles.scss" ], - "scripts": [] + "scripts": [], + "vendorChunk": true, + "extractLicenses": false, + "buildOptimizer": false, + "sourceMap": true, + "optimization": false, + "namedChunks": true }, "configurations": { "production": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, "budgets": [ { "type": "initial", @@ -51,21 +64,26 @@ "maximumWarning": "2kb", "maximumError": "4kb" } - ], - "outputHashing": "all" + ] }, "development": { - "buildOptimizer": false, - "optimization": false, - "vendorChunk": true, - "extractLicenses": false, - "sourceMap": true, - "namedChunks": true, + "optimization": true, + "sourceMap": false, + "namedChunks": false, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, "fileReplacements": [ { "replace": "src/environments/environment.ts", "with": "src/environments/environment.development.ts" } + ], + "budgets": [ + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" + } ] } }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5077885..6e58c18 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,14 +3,16 @@ import { BrowserModule, Title } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { registerLocaleData } from '@angular/common'; import localeFr from '@angular/common/locales/fr'; -import { ChartistModule } from "ng-chartist"; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; import { AuthModule } from './components/auth/auth.module'; import { HomeModule } from './components/home/home.module'; -import { SpinnerComponent, FullComponent } from './components/shared'; +import { SpinnerComponent } from './components/shared'; +import { FullComponent } from 'src/app/components/shared/layout'; +//import { FullComponent } from 'src/app/components/shared/layout/full.component'; +//import { HeaderComponent, FooterComponent, FullComponent } from 'src/app/components/shared/layout'; registerLocaleData(localeFr); @@ -18,11 +20,14 @@ registerLocaleData(localeFr); declarations: [ AppComponent ], imports: [ BrowserModule, + CoreModule, + AuthModule, AppRoutingModule, - ChartistModule, BrowserAnimationsModule, - AuthModule, CoreModule, HomeModule, - SpinnerComponent, FullComponent + SpinnerComponent, + FullComponent, + //HeaderComponent, FooterComponent, FullComponent, + HomeModule ], providers: [ Title, { provide: LOCALE_ID, useValue: 'fr-FR' } ], bootstrap: [ AppComponent ] diff --git a/src/app/components/calculator/calculator.component.html b/src/app/components/calculator/calculator.component.html index 0c97f83..7ca0f48 100644 --- a/src/app/components/calculator/calculator.component.html +++ b/src/app/components/calculator/calculator.component.html @@ -1,3 +1,110 @@ +
+ + + Calcul de taille de voile + DT48 - 13 mars 2020 + + + + + + + + + + +
+ + Nombre de sauts + + + + Poids nu + + + + Poids équipement + + + + Taille actuelle + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{tableHeader[0].name}} {{element.weight}} {{tableHeader[1].name}} {{element.ranges[0].value}} {{tableHeader[2].name}} {{element.ranges[1].value}} {{tableHeader[3].name}} {{element.ranges[2].value}} {{tableHeader[4].name}} {{element.ranges[3].value}} {{tableHeader[5].name}} {{element.ranges[4].value}} {{tableHeader[6].name}} {{element.ranges[5].value}} {{tableHeader[7].name}} {{element.ranges[6].value}} {{tableHeader[8].name}} {{element.ranges[7].value}} {{tableHeader[9].name}} {{element.ranges[8].value}}
+
+ +
+ + +

{{title}}

diff --git a/src/app/components/calculator/calculator.component.scss b/src/app/components/calculator/calculator.component.scss index f866337..db84270 100644 --- a/src/app/components/calculator/calculator.component.scss +++ b/src/app/components/calculator/calculator.component.scss @@ -1,26 +1,41 @@ -section { - display: table; -} -.demo-label { - display: table-cell; - font-size: 14px; - margin-left: 8px; - min-width: 120px; -} -.demo-button-row { - display: table-cell; - max-width: 900px; -} -.demo-button-row .mat-mdc-button-base { - margin: 8px 8px 8px 0; -} -.demo-flex-container { - display: flex; - justify-content: space-between; - flex-wrap: wrap; -} -.demo-button-container { - display: flex; - justify-content: center; - width: 120px; +.calculator-page { + section { + display: table; + } + .demo-label { + display: table-cell; + font-size: 14px; + margin-left: 8px; + min-width: 120px; + } + .demo-button-row { + display: table-cell; + max-width: 900px; + } + .demo-button-row .mat-mdc-button-base { + margin: 8px 8px 8px 0; + } + .demo-flex-container { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + } + .demo-button-container { + display: flex; + justify-content: center; + width: 120px; + } + /* Chrome, Safari, Edge, Opera */ + input::-webkit-outer-spin-button, + input::-webkit-inner-spin-button { + appearance: none; + -webkit-appearance: none; + margin: 0; + } + + /* Firefox */ + input[type=number] { + appearance: textfield; + -moz-appearance: textfield; + } } \ No newline at end of file diff --git a/src/app/components/calculator/calculator.component.ts b/src/app/components/calculator/calculator.component.ts index f3fb584..00eabfe 100644 --- a/src/app/components/calculator/calculator.component.ts +++ b/src/app/components/calculator/calculator.component.ts @@ -1,28 +1,111 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, Input, OnInit, OnDestroy, ViewChild } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator'; +import { MatSort, MatSortModule } from '@angular/material/sort'; +import { MatTableDataSource, MatTableModule } from '@angular/material/table'; + +import { CalcResult, InputParams, Range, WeightSize, weightSizes } from 'src/app/core/models'; @Component({ standalone: true, imports: [ - MatButtonModule, MatDividerModule, MatIconModule + FormsModule, + MatButtonModule, MatCardModule, MatDividerModule, + MatFormFieldModule, MatInputModule, MatIconModule, MatMenuModule, + MatPaginatorModule, MatSortModule, MatTableModule ], selector: 'huapp-calculator', - templateUrl: './calculator.component.html', - styleUrls: ['./calculator.component.scss'] + styleUrls: ['./calculator.component.scss'], + templateUrl: './calculator.component.html' }) export class CalculatorComponent implements OnInit, OnDestroy { - title = 'Taille de voile - DT48'; + title = 'Calcul de taille de voile'; + subtitle = 'DT48 - 13 mars 2020'; + displayedColumns: string[] = [ + "weight", + "range_1", "range_2", "range_3", + "range_4", "range_5", "range_6", + "range_7", "range_8", "range_9" + ]; + tableHeader: {name: string, active: string}[] = [ + {name: "Poids nu", active: ''}, + {name: "0 à 99", active: ''}, + {name: "100 à 249", active: ''}, + {name: "250 à 399", active: ''}, + {name: "400 à 599", active: ''}, + {name: "600 à 799", active: ''}, + {name: "800 à 999", active: ''}, + {name: "1000 à 1399", active: ''}, + {name: "1400 à 1799", active: ''}, + {name: "1800 à 2000", active: ''}, + ];; + @Input() canopy_size_table!: MatTableDataSource; + @Input() inputs: InputParams = { + jumps: 0, + weight: 60, + gear: 10, + current: 175 + } as InputParams; + + @ViewChild(MatSort) sort!: MatSort; + @ViewChild(MatPaginator) paginator!: MatPaginator; + constructor() { } ngOnInit() { - // + return this.loadData(); } ngOnDestroy() { //this._scavenger.unsubscribe(); } + loadData():void { + this.refreshActive(); + this.canopy_size_table = new MatTableDataSource(weightSizes); + } + + refreshActive():void { + weightSizes.forEach(element => { + element.active = ''; + element.ranges.forEach(range => { + range.active = ''; + }); + }); + this.tableHeader.forEach(element => { + element.active = ''; + }); + if (this.inputs.weight >= 60 && this.inputs.weight <= 110) { + weightSizes[(this.inputs.weight - 60)].active = 'active'; + } + if (this.inputs.jumps >= 0) { + var num = this.getRangeNum(); + this.tableHeader[num].active = 'active'; + weightSizes.forEach(element => { + element.ranges[(num-1)].active = 'active'; + }); + } + } + + private getRangeNum(): number { + var data: Range[] = weightSizes[0].ranges; + var num: number = 1; + data.some((range: Range) => { + if (range.start <= this.inputs.jumps && range.end >= this.inputs.jumps) { + num = range.num; + return true; + } + return false; + }); + return num; + } + } diff --git a/src/app/components/home/dashboard-components/aeronefs/aeronefs.component.ts b/src/app/components/home/dashboard-components/aeronefs/aeronefs.component.ts index a09b29c..36edd40 100755 --- a/src/app/components/home/dashboard-components/aeronefs/aeronefs.component.ts +++ b/src/app/components/home/dashboard-components/aeronefs/aeronefs.component.ts @@ -5,7 +5,7 @@ import { ChartistModule, Configuration } from 'ng-chartist'; import { Observable, Subscription } from 'rxjs'; import { BackendService, AeronefsService, UserService } from 'src/app/core/services'; -import { Aeronef, AeronefAggregate } from 'src/app/core/models'; +import { Aeronef, AeronefByImat } from 'src/app/core/models'; @Component({ standalone: true, @@ -15,7 +15,7 @@ import { Aeronef, AeronefAggregate } from 'src/app/core/models'; }) export class AeronefsComponent implements OnInit { private _aeronefs: Subscription = new Subscription(); - aggregate!: Array + aggregate!: Array aeronefs!: Array; aeronefsCount = 0; rows: Object[] = [] as Array; @@ -103,8 +103,8 @@ export class AeronefsComponent implements OnInit { } loadAeronefs() { - const aeronefs$: Observable> = this.aeronefsService.getAll(); - this._aeronefs = aeronefs$.subscribe((aggregate: Array) => { + const aeronefs$: Observable> = this.aeronefsService.getAllByImat(); + this._aeronefs = aeronefs$.subscribe((aggregate: Array) => { this.aggregate = aggregate; this.aeronefsCount = aggregate.length; var labels: string[] = []; diff --git a/src/app/components/home/dashboard-components/canopy-models/canopy-models.component.ts b/src/app/components/home/dashboard-components/canopy-models/canopy-models.component.ts index c5ea276..890abcb 100755 --- a/src/app/components/home/dashboard-components/canopy-models/canopy-models.component.ts +++ b/src/app/components/home/dashboard-components/canopy-models/canopy-models.component.ts @@ -7,7 +7,7 @@ import { Observable, Observer, Subscription } from 'rxjs'; import { take } from 'rxjs/operators'; import { BackendService, CanopiesService } from 'src/app/core/services'; -import { Canopy, CanopyAggregate, ReduceRow } from 'src/app/core/models'; +import { Canopy, CanopyBySize, ReduceRow } from 'src/app/core/models'; @Component({ standalone: true, @@ -17,7 +17,7 @@ import { Canopy, CanopyAggregate, ReduceRow } from 'src/app/core/models'; }) export class CanopyModelsComponent implements OnInit { private _canopies: Subscription = new Subscription(); - aggregate!: Array + aggregate!: Array canopies!: Array; canopiesCount = 0; rows: Object[] = [] as Array; @@ -101,8 +101,8 @@ export class CanopyModelsComponent implements OnInit { } loadCanopies() { - const canopies$: Observable> = this.canopiesService.getAll(); - this._canopies = canopies$.subscribe((aggregate: Array) => { + const canopies$: Observable> = this.canopiesService.getAllBySize(); + this._canopies = canopies$.subscribe((aggregate: Array) => { this.aggregate = aggregate; //this.canopies = canopies; this.canopiesCount = aggregate.length; diff --git a/src/app/components/home/dashboard-components/drop-zones/drop-zones.component.ts b/src/app/components/home/dashboard-components/drop-zones/drop-zones.component.ts index 5cc2632..c3dcf87 100755 --- a/src/app/components/home/dashboard-components/drop-zones/drop-zones.component.ts +++ b/src/app/components/home/dashboard-components/drop-zones/drop-zones.component.ts @@ -6,7 +6,7 @@ import { ChartistModule, Configuration } from 'ng-chartist'; import { Observable, Observer, Subscription } from 'rxjs'; import { BackendService, DropZonesService } from 'src/app/core/services'; -import { DropZone, DropZoneAggregate, ReduceRow} from 'src/app/core/models'; +import { DropZone, DropZoneByOaci, ReduceRow} from 'src/app/core/models'; @Component({ standalone: true, @@ -16,7 +16,7 @@ import { DropZone, DropZoneAggregate, ReduceRow} from 'src/app/core/models'; }) export class DropZonesComponent implements OnInit { private _dropzones: Subscription = new Subscription(); - aggregate!: Array + aggregate!: Array dropzones!: Array; dropzonesCount = 0; seriesName: string[] = [];//= ["Arcachon", "Béni-Mellal", "La Réole", "Royan", "Pamiers", "Soulac", "Sables d'Olonne", "Rochefort"]; @@ -155,8 +155,8 @@ export class DropZonesComponent implements OnInit { } loadDropZones() { - const dropzones$: Observable> = this.dropzonesService.getAll(); - this._dropzones = dropzones$.subscribe((aggregate: Array) => { + const dropzones$: Observable> = this.dropzonesService.getAllByOaci(); + this._dropzones = dropzones$.subscribe((aggregate: Array) => { this.aggregate = aggregate; //this.dropzones = dropzones; this.dropzonesCount = aggregate.length; diff --git a/src/app/components/home/dashboard-components/index.ts b/src/app/components/home/dashboard-components/index.ts index f6fceca..ff5f697 100644 --- a/src/app/components/home/dashboard-components/index.ts +++ b/src/app/components/home/dashboard-components/index.ts @@ -1,7 +1,7 @@ -//export * from './jumps-by-month/jumps-by-month.component'; -export * from './drop-zones/drop-zones.component'; -//export * from './drop-zones-bar/drop-zones-bar.component'; export * from './aeronefs/aeronefs.component'; //export * from './aeronefs-bar/aeronefs-bar.component'; +export * from './canopy-models/canopy-models.component'; //export * from './canopy-sizes/canopy-sizes.component'; -export * from './canopy-models/canopy-models.component'; \ No newline at end of file +export * from './drop-zones/drop-zones.component'; +//export * from './drop-zones-bar/drop-zones-bar.component'; +//export * from './jumps-by-month/jumps-by-month.component'; \ No newline at end of file diff --git a/src/app/components/home/home.component.ts b/src/app/components/home/home.component.ts index 5441b8e..83daef9 100644 --- a/src/app/components/home/home.component.ts +++ b/src/app/components/home/home.component.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, Data, Router } from '@angular/router'; import { Observable, Observer, Subscription } from 'rxjs'; import { take } from 'rxjs/operators'; -import { User, Errors, Aeronef, AeronefAggregate, AeronefList, Canopy, CanopyAggregate, DropZone, DropZoneAggregate } from 'src/app/core/models'; +import { User, Errors, Aeronef, AeronefByImat, AeronefList, Canopy, CanopyBySize, DropZone, DropZoneByOaci } from 'src/app/core/models'; import { AeronefsService, CanopiesService, DropZonesService, UserService } from 'src/app/core/services'; import { ShowAuthedDirective } from 'src/app/components/shared/show-authed.directive'; import { AeronefsComponent, DropZonesComponent, CanopyModelsComponent } from './dashboard-components'; @@ -32,13 +32,13 @@ export class HomeComponent implements OnInit, OnDestroy { errors!: Errors; isAuthenticated = false; canModify = false; - aeronefAggregate!: Array + aeronefAggregate!: Array aeronefs!: Array; aeronefsCount = 0; - canopyAggregate!: Array + canopyAggregate!: Array canopies!: Array; canopiesCount = 0; - dropzoneAggregate!: Array + dropzoneAggregate!: Array dropzones!: Array; dropzonesCount = 0; @@ -75,8 +75,8 @@ export class HomeComponent implements OnInit, OnDestroy { } loadAeronefs() { - const aeronefs$: Observable> = this.aeronefsService.getAll(); - this._aeronefs = aeronefs$.subscribe((aggregate: Array) => { + const aeronefs$: Observable> = this.aeronefsService.getAllByImat(); + this._aeronefs = aeronefs$.subscribe((aggregate: Array) => { this.aeronefAggregate = aggregate; this.aeronefsCount = aggregate.length; console.log(this.aeronefs); @@ -84,8 +84,8 @@ export class HomeComponent implements OnInit, OnDestroy { }); } loadCanopies() { - const canopies$: Observable> = this.canopiesService.getAll(); - this._canopies = canopies$.subscribe((aggregate: Array) => { + const canopies$: Observable> = this.canopiesService.getAllBySize(); + this._canopies = canopies$.subscribe((aggregate: Array) => { this.canopyAggregate = aggregate; this.canopiesCount = aggregate.length; // console.log(this.canopies); @@ -93,8 +93,8 @@ export class HomeComponent implements OnInit, OnDestroy { }); } loadDropzones() { - const dropzones$: Observable> = this.dropzonesService.getAll(); - this._dropzones = dropzones$.subscribe((aggregate: Array) => { + const dropzones$: Observable> = this.dropzonesService.getAllByOaci(); + this._dropzones = dropzones$.subscribe((aggregate: Array) => { this.dropzoneAggregate = aggregate; this.dropzonesCount = aggregate.length; // console.log(this.dropzones); diff --git a/src/app/components/shared/index.ts b/src/app/components/shared/index.ts index e127f4f..4f97ad6 100644 --- a/src/app/components/shared/index.ts +++ b/src/app/components/shared/index.ts @@ -2,6 +2,8 @@ export * from './accordion'; export * from './confirmed.validator'; export * from './dialogs'; export * from './helpers-jump'; +export * from './layout/header.component'; +export * from './layout/footer.component'; export * from './layout/full.component'; export * from './list-errors/list-errors.component'; export * from './menu-items'; diff --git a/src/app/components/shared/layout/full.component.html b/src/app/components/shared/layout/full.component.html index 7cb8a18..af06ade 100755 --- a/src/app/components/shared/layout/full.component.html +++ b/src/app/components/shared/layout/full.component.html @@ -1,48 +1,4 @@ - - -
- - - - - - - - -
- - - @{{ currentUser.username }} -
- - - - - - -
- - -
- - - - - +
@@ -123,14 +79,7 @@
- +
diff --git a/src/app/components/shared/layout/full.component.ts b/src/app/components/shared/layout/full.component.ts index d075c3c..e24e532 100755 --- a/src/app/components/shared/layout/full.component.ts +++ b/src/app/components/shared/layout/full.component.ts @@ -15,6 +15,7 @@ import { Observable, Subscription } from 'rxjs'; import { User } from 'src/app/core/models'; import { UserService } from 'src/app/core/services'; import { MenuItems, ShowAuthedDirective, SpinnerComponent, AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective } from 'src/app/components/shared'; +import { HeaderComponent, FooterComponent } from 'src/app/components/shared/layout'; /** @title Responsive sidenav */ @@ -24,7 +25,7 @@ import { MenuItems, ShowAuthedDirective, SpinnerComponent, AccordionAnchorDirect imports: [ CommonModule, RouterModule, RouterOutlet, MatBadgeModule, MatButtonModule, MatIconModule, MatListModule, MatMenuModule, MatSidenavModule, MatToolbarModule, - ShowAuthedDirective, SpinnerComponent, + ShowAuthedDirective, SpinnerComponent, HeaderComponent, FooterComponent, AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective ], providers: [ MenuItems ], diff --git a/src/app/core/models/aeronef.model.ts b/src/app/core/models/aeronef.model.ts index 9cdeb5e..d706fa2 100644 --- a/src/app/core/models/aeronef.model.ts +++ b/src/app/core/models/aeronef.model.ts @@ -8,10 +8,18 @@ export interface Aeronef { updatedAt: string; } -export interface AeronefAggregate { +export interface AeronefByImat { _id: { aeronef: string, imat: string }, count: number +} + +export interface AeronefByYear { + _id: { + aeronef: string, + year: number + }, + count: number } \ No newline at end of file diff --git a/src/app/core/models/canopy.model.ts b/src/app/core/models/canopy.model.ts index a41b64a..140a637 100644 --- a/src/app/core/models/canopy.model.ts +++ b/src/app/core/models/canopy.model.ts @@ -8,10 +8,18 @@ export interface Canopy { updatedAt: string; } -export interface CanopyAggregate { +export interface CanopyBySize { _id: { canopy: string, taille: number }, count: number +} + +export interface CanopyByYear { + _id: { + canopy: string, + year: number + }, + count: number } \ No newline at end of file diff --git a/src/app/core/models/dropzone.model.ts b/src/app/core/models/dropzone.model.ts index fae9893..cfb1e04 100644 --- a/src/app/core/models/dropzone.model.ts +++ b/src/app/core/models/dropzone.model.ts @@ -8,10 +8,18 @@ export interface DropZone { updatedAt: string; } -export interface DropZoneAggregate { +export interface DropZoneByOaci { _id: { lieu: string, oaci: string }, count: number +} + +export interface DropZoneByYear { + _id: { + lieu: string, + year: number + }, + count: number } \ No newline at end of file diff --git a/src/app/core/models/index.ts b/src/app/core/models/index.ts index 4000dc4..a1aee4b 100644 --- a/src/app/core/models/index.ts +++ b/src/app/core/models/index.ts @@ -2,6 +2,7 @@ export * from './aeronef.model'; export * from './aeronef-list.model'; export * from './application.model'; export * from './application-list-config.model'; +export * from './calculator.model'; export * from './canopy.model'; export * from './canopysize.model'; export * from './reducerow.model'; diff --git a/src/app/core/services/aeronefs.service.ts b/src/app/core/services/aeronefs.service.ts index 8d5700c..ddd542f 100644 --- a/src/app/core/services/aeronefs.service.ts +++ b/src/app/core/services/aeronefs.service.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiService } from './api.service'; -import { Aeronef, AeronefAggregate, AeronefList, JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models'; +import { Aeronef, AeronefByImat, AeronefList, JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models'; @Injectable({ providedIn: 'root' }) export class AeronefsService { @@ -12,7 +12,7 @@ export class AeronefsService { private apiService: ApiService ) { } - getAll(): Observable> { + getAllByImat(): Observable> { return this.apiService.get('/aeronefs') .pipe(map(data => data.aeronefs)); /* diff --git a/src/app/core/services/canopies.service.ts b/src/app/core/services/canopies.service.ts index 2ca1bbc..864cb83 100644 --- a/src/app/core/services/canopies.service.ts +++ b/src/app/core/services/canopies.service.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiService } from './api.service'; -import { Canopy, CanopyAggregate ,JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models'; +import { Canopy, CanopyBySize ,JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models'; @Injectable({ providedIn: 'root' }) export class CanopiesService { @@ -12,7 +12,7 @@ export class CanopiesService { private apiService: ApiService ) { } - getAll(): Observable> { + getAllBySize(): Observable> { return this.apiService.get('/canopies') .pipe(map(data => data.canopies)); } diff --git a/src/app/core/services/dropzones.service.ts b/src/app/core/services/dropzones.service.ts index 26fde1e..e49e8d6 100644 --- a/src/app/core/services/dropzones.service.ts +++ b/src/app/core/services/dropzones.service.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiService } from './api.service'; -import { DropZone, DropZoneAggregate, JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models'; +import { DropZone, DropZoneByOaci, JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models'; @Injectable({ providedIn: 'root' }) export class DropZonesService { @@ -12,7 +12,7 @@ export class DropZonesService { private apiService: ApiService ) { } - getAll(): Observable> { + getAllByOaci(): Observable> { return this.apiService.get('/dropzones') .pipe(map(data => data.dropzones)); } diff --git a/src/styles/app.scss b/src/styles/app.scss index 3f28aca..cb6a4f5 100755 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -107,4 +107,97 @@ huapp-full-layout .mdc-text-field--filled .mdc-floating-label { padding-top: 8px; padding-bottom: 8px; } +} + +/********************** +* Background Colors * +**********************/ +.bg-primary { + background-color: $primary !important; +} +.bg-secondary, +.bg-warn { + background-color: $secondary !important; +} +.bg-accent { + background-color: $accent !important; +} +.bg-success { + background-color: $success !important; +} +.bg-info { + background-color: $info !important; +} +.bg-warning { + background-color: $warning !important; +} +.bg-danger { + background-color: $danger !important; +} +.bg-error { + background-color: $error !important; +} +.bg-white { + background-color: $white !important; +} +.bg-red { + background-color: $red !important; +} +.bg-red-dark { + background-color: $red-dark !important; +} +.bg-orange { + background-color: $orange !important; +} +.bg-yellow { + background-color: $yellow !important; +} +.bg-megna { + background-color: $megna !important; +} +.bg-green { + background-color: $green !important; +} +.bg-teal { + background-color: $teal !important; +} +.bg-turquoise { + background-color: $turquoise !important; +} +.bg-cyan { + background-color: $cyan !important; +} +.bg-blue { + background-color: $blue !important; +} +.bg-navy { + background-color: $navy !important; +} +.bg-pink { + background-color: $pink !important; +} +.bg-magenta { + background-color: $magenta !important; +} +.bg-purple { + background-color: $purple !important; +} +.bg-purple-dark { + background-color: $purple-dark !important; +} +.bg-raspberry { + background-color: $raspberry !important; +} +.bg-grey { + background-color: $grey !important; +} +.bg-muted { + background-color: $muted !important; +} +.bg-extra-muted { + background-color: $extra-muted !important; +} +.bg-crystal, +.bg-crystal .mdc-text-field--filled:not(.mdc-text-field--disabled) { + background-color: transparent !important; } \ No newline at end of file diff --git a/src/styles/styles.scss b/src/styles/styles.scss index 9b0b3b9..29ff5d3 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -29,7 +29,7 @@ File: scss @import "bootstrap/scss/grid"; @import "bootstrap/scss/helpers"; @import "bootstrap/scss/utilities/api"; -@import "bootstrap/scss/tables"; +//@import "bootstrap/scss/tables"; @import "bootstrap/scss/pagination"; @import "bootstrap/scss/alert"; @@ -122,7 +122,7 @@ $background: map.get($headup_app-theme, background); @import 'spinner'; @import 'header'; @import 'sidebar'; -//@import 'tables'; +@import 'tables'; @import 'charts'; @import 'responsive'; @import 'app'; diff --git a/src/styles/tables.scss b/src/styles/tables.scss index f53d7ac..bdfeb8c 100644 --- a/src/styles/tables.scss +++ b/src/styles/tables.scss @@ -9,7 +9,7 @@ File: scss Table *******************/ -.table-rasponsive { +.table-responsive { overflow: auto; .mat-table { min-width: 280px; @@ -77,31 +77,41 @@ caption { } .table.table-dark>thead>tr>th { border-bottom:2px solid rgb(221, 221, 221, 0.3); + padding-top: 1rem; } .table.table-dark>tfoot>tr>th { border-top:2px solid rgb(221, 221, 221, 0.3); + padding-top: 1rem; } -.table.table-dark>tbody>tr.active>td, -.table.table-dark>tbody>tr.active>th, -.table.table-dark>tbody>tr>td.active, -.table.table-dark>tbody>tr>th.active, -.table.table-dark>tfoot>tr.active>td, -.table.table-dark>tfoot>tr.active>th, -.table.table-dark>tfoot>tr>td.active, -.table.table-dark>tfoot>tr>th.active, -.table.table-dark>thead>tr.active>td, -.table.table-dark>thead>tr.active>th, -.table.table-dark>thead>tr>td.active, -.table.table-dark>thead>tr>th.active { + +tr.mat-mdc-header-row.primary { + background-color: rgba(167, 212, 196, 0.1); +} +.table.table-dark>tbody>tr.primary.active>td, +.table.table-dark>tbody>tr.primary.active>th, +.table.table-dark>tbody>tr.primary>td.active, +.table.table-dark>tbody>tr.primary>th.active, +.table.table-dark>tfoot>tr.primary.active>td, +.table.table-dark>tfoot>tr.primary.active>th, +.table.table-dark>tfoot>tr.primary>td.active, +.table.table-dark>tfoot>tr.primary>th.active, +.table.table-dark>thead>tr.primary.active>td, +.table.table-dark>thead>tr.primary.active>th, +.table.table-dark>thead>tr.primary>td.active, +.table.table-dark>thead>tr.primary>th.active { background-color: rgba(165, 212, 146, 0.2); //#a5d492; } -.table-dark.table-hover>tbody>tr.active:hover>td, -.table-dark.table-hover>tbody>tr.active:hover>th, -.table-dark.table-hover>tbody>tr:hover>.active, -.table-dark.table-hover>tbody>tr>td.active:hover, -.table-dark.table-hover>tbody>tr>th.active:hover { +.table-dark.table-hover>tbody>tr.primary.active:hover>td, +.table-dark.table-hover>tbody>tr.primary.active:hover>th, +.table-dark.table-hover>tbody>tr.primary:hover>.active, +.table-dark.table-hover>tbody>tr.primary>td.active:hover, +.table-dark.table-hover>tbody>tr.primary>th.active:hover { background-color: rgba(165, 212, 146, 0.3); //#93c081; } + +tr.mat-mdc-header-row.warn { + background-color: rgba(151, 136, 199, 0.1); +} .table.table-dark>tbody>tr.warn.active>td, .table.table-dark>tbody>tr.warn.active>th, .table.table-dark>tbody>tr.warn>td.active, @@ -297,6 +307,13 @@ table th[class*=col-] { min-height:.01%; overflow-x:auto } +.table .mat-mdc-row { + height: auto; + color: inherit; +} +.table .mat-mdc-header-row { + height: auto; +} @media screen and (max-width:767px) { .table-responsive { width:100%;