Added printing formulas
This commit is contained in:
parent
30133504a1
commit
c87273fa1e
@ -50,7 +50,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Footer -->
|
<!-- Footer -->
|
||||||
<footer>
|
<footer class="d-print-none">
|
||||||
<div class="d-flex py-4 justify-content-center">
|
<div class="d-flex py-4 justify-content-center">
|
||||||
<div class="d-none d-md-inline ml-5 text-left">
|
<div class="d-none d-md-inline ml-5 text-left">
|
||||||
<h5>MAIN MENU</h5>
|
<h5>MAIN MENU</h5>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<mat-drawer-container class="flex-grow-1">
|
<mat-drawer-container class="flex-grow-1">
|
||||||
<mat-drawer #drawer [mode]="mobile ? 'over' : 'side'" [opened]="!mobile" [disableClose]="!mobile" [autoFocus]="false">
|
<mat-drawer #drawer class="d-print-none" [mode]="mobile ? 'over' : 'side'" [opened]="!mobile" [disableClose]="!mobile" [autoFocus]="false">
|
||||||
<div class="sticky-top bg-white">
|
<div class="sticky-top bg-white">
|
||||||
<mat-form-field appearance="outline" class="mx-3 mt-3 pb-0">
|
<mat-form-field appearance="outline" class="mx-3 mt-3 pb-0">
|
||||||
<mat-label>Search</mat-label>
|
<mat-label>Search</mat-label>
|
||||||
@ -18,8 +18,8 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
</mat-list>
|
</mat-list>
|
||||||
</mat-drawer>
|
</mat-drawer>
|
||||||
<mat-drawer-content class="p-3 bg-white" style="min-height: 450px; background: url('assets/img/splatter.jpg') center; background-size: cover;">
|
<mat-drawer-content class="p-3 bg-white ml-print-0" style="min-height: 450px; background: url('assets/img/splatter.jpg') center; background-size: cover;">
|
||||||
<div class="d-block" style="overflow: auto">
|
<div class="d-block d-print-none" style="overflow: auto">
|
||||||
<button *ngIf="mobile" class="mr-2" mat-raised-button (click)="drawer.open()">
|
<button *ngIf="mobile" class="mr-2" mat-raised-button (click)="drawer.open()">
|
||||||
<mat-icon>opacity</mat-icon> Formulas
|
<mat-icon>opacity</mat-icon> Formulas
|
||||||
</button>
|
</button>
|
||||||
@ -48,15 +48,17 @@
|
|||||||
<button mat-button class="button-fix ml-2"><i class="fab fa-linux mr-1 mb-1"></i> Linux</button>
|
<button mat-button class="button-fix ml-2"><i class="fab fa-linux mr-1 mb-1"></i> Linux</button>
|
||||||
</mat-card-content>
|
</mat-card-content>
|
||||||
</mat-card>
|
</mat-card>
|
||||||
<mat-card *ngIf="formula" class="my-4 mx-auto" style="max-width: 600px">
|
<mat-card *ngIf="formula" class="my-4 mx-auto formula-card">
|
||||||
|
<div class="d-none d-print-block mb-5 pb-5">
|
||||||
|
<h1 class="mb-0">FH & Sons: Formula Manager</h1>
|
||||||
|
<small>All rights reserved</small>
|
||||||
|
</div>
|
||||||
<mat-card-header>
|
<mat-card-header>
|
||||||
<mat-card-title class="mb-0"><h4>{{formula.name}}</h4></mat-card-title>
|
<mat-card-title class="mb-0"><h4>{{formula.name}}</h4></mat-card-title>
|
||||||
<mat-card-subtitle>{{formula.createdOn.seconds * 1000 | date}}</mat-card-subtitle>
|
<mat-card-subtitle>{{formula.createdOn.seconds * 1000 | date}}</mat-card-subtitle>
|
||||||
<div *ngIf="store.user" class="ml-auto">
|
<div *ngIf="store.user" class="ml-auto">
|
||||||
<h4>Approved:
|
<h5 *ngIf="formula.approved">Approved<span *ngIf="formula.approvedOn">: {{formula.approvedOn.seconds * 1000 | date}}</span></h5>
|
||||||
<mat-icon *ngIf="formula.approved" class="text-success" style="transform: translateY(20%)">check_circle</mat-icon>
|
<button mat-raised-button color="primary" *ngIf="!formula.approved" (click)="approve(formula)">Approve</button>
|
||||||
<mat-icon *ngIf="!formula.approved" class="text-danger" style="transform: translateY(20%)">remove_circle</mat-icon>
|
|
||||||
</h4>
|
|
||||||
</div>
|
</div>
|
||||||
</mat-card-header>
|
</mat-card-header>
|
||||||
<mat-card-content>
|
<mat-card-content>
|
||||||
@ -99,9 +101,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</mat-card-content>
|
</mat-card-content>
|
||||||
<mat-card-actions *ngIf="store.user" style="overflow: hidden">
|
<mat-card-actions *ngIf="store.user" class="d-print-none" style="overflow: hidden">
|
||||||
<mat-divider></mat-divider>
|
<mat-divider></mat-divider>
|
||||||
<button *ngIf="!formula.approved" mat-button class="m-1 mt-3" (click)="approve(formula)">Approve</button>
|
<button mat-button class="m-1 mt-3" onclick="window.print()">Print</button>
|
||||||
<div class="float-right m-1 mt-3">
|
<div class="float-right m-1 mt-3">
|
||||||
<button mat-button (click)="edit(formula)">Edit</button>
|
<button mat-button (click)="edit(formula)">Edit</button>
|
||||||
<button mat-button class="ml-2" color="warn" (click)="delete(formula)">Delete</button>
|
<button mat-button class="ml-2" color="warn" (click)="delete(formula)">Delete</button>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import {Component} from '@angular/core';
|
import {Component, NgZone} from '@angular/core';
|
||||||
import {ConvertFromGPipe, ConvertToGPipe} from './units.pipe';
|
import {ConvertFromGPipe, ConvertToGPipe} from './units.pipe';
|
||||||
import {ElectronService} from 'ngx-electron';
|
import {ElectronService} from 'ngx-electron';
|
||||||
import {LocalStorage} from 'webstorage-decorators';
|
import {LocalStorage} from 'webstorage-decorators';
|
||||||
@ -9,6 +9,7 @@ import {AppStore} from '../app.store';
|
|||||||
import {map} from 'rxjs/operators';
|
import {map} from 'rxjs/operators';
|
||||||
import {DeleteComponent} from '../delete/delete.component';
|
import {DeleteComponent} from '../delete/delete.component';
|
||||||
import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
|
import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
|
||||||
|
import * as firebase from 'firebase';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'formula-manager',
|
selector: 'formula-manager',
|
||||||
@ -37,16 +38,18 @@ export class FormulaManagerComponent {
|
|||||||
this._newTotal = new ConvertToGPipe().transform(total, this.unit);
|
this._newTotal = new ConvertToGPipe().transform(total, this.unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(public electron: ElectronService, private dialog: MatDialog, private $breakpoint: BreakpointObserver, public store: AppStore) {
|
constructor(public electron: ElectronService, private dialog: MatDialog, private $breakpoint: BreakpointObserver, private ngZone: NgZone, public store: AppStore) {
|
||||||
this.formulas = this.store.formulas.pipe(map(rows => rows.filter(row => this.store.user || row.approved)));
|
this.formulas = this.store.formulas.pipe(map(rows => rows.filter(row => this.store.user || row.approved)));
|
||||||
|
|
||||||
// Handle switching between mobile and desktop
|
// Handle switching between mobile and desktop
|
||||||
this.$breakpoint.observe(Breakpoints.Handset).subscribe(e => this.mobile = e.matches);
|
this.$breakpoint.observe(Breakpoints.Handset).subscribe(e => this.mobile = e.matches);
|
||||||
}
|
}
|
||||||
|
|
||||||
approve(formula) {
|
async approve(formula) {
|
||||||
formula.approved = true;
|
formula.approved = true;
|
||||||
formula.ref.update({approved: true});
|
await formula.ref.update({approved: true, approvedOn: firebase.firestore.FieldValue.serverTimestamp()});
|
||||||
|
await this.store.formulas.toPromise();
|
||||||
|
this.ngZone.runTask(() => this.displayFormula(formula));
|
||||||
}
|
}
|
||||||
|
|
||||||
cost() {
|
cost() {
|
||||||
|
@ -130,3 +130,17 @@ footer h5 {
|
|||||||
.mat-form-field-indix {
|
.mat-form-field-indix {
|
||||||
padding: 0.5em 0 1em 0;
|
padding: 0.5em 0 1em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media print {
|
||||||
|
.ml-print-0 {
|
||||||
|
margin-left: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.formula-card {
|
||||||
|
max-width: none !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.formula-card {
|
||||||
|
max-width: 600px;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user