Commit 5dd6e2df authored by Renzo Beux's avatar Renzo Beux
Browse files

Merge branch 'develop'

parents 53393d65 2459750d
Pipeline #16018 passed with stage
in 2 minutes and 21 seconds
button {
margin: 1rem 1rem 0 1rem;
font-family: Roboto;
font-style: normal;
font-weight: 400;
font-size: 3rem;
height: 20rem;
width: 20rem;
}
.router-content {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
flex-wrap: wrap;
}
\ No newline at end of file
<div class="router-content">
<button mat-raised-button color="primary" routerLink="autorizacion">
Autorización
</button>
<button mat-raised-button color="primary" routerLink="permisos">
Permisos
</button>
<button mat-raised-button color="primary" routerLink="valores">
Valores
</button>
</div>
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AdminRouterComponent } from './admin-router.component';
describe('AdminRouterComponent', () => {
let component: AdminRouterComponent;
let fixture: ComponentFixture<AdminRouterComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ AdminRouterComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(AdminRouterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-admin-router',
templateUrl: './admin-router.component.html',
styleUrls: ['./admin-router.component.css']
})
export class AdminRouterComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}
......@@ -5,11 +5,15 @@ import { AdminComponent } from './admin.component';
import { AutorizacionUsuariosComponent } from './autorizacion-usuarios/autorizacion-usuarios.component';
import { PermisosUsuariosComponent } from './permisos-usuarios/permisos-usuarios.component';
import { ConfiguracionValoresComponent } from './configuracion-valores/configuracion-valores.component';
import { AdminRouterComponent } from './admin-router/admin-router.component';
const routes: Routes = [{
path: '',
component: AdminComponent,
children: [{
path: '',
component: AdminRouterComponent,
}, {
path: 'autorizacion',
component: AutorizacionUsuariosComponent,
}, {
......
.content {
height: 100%;
}
\ No newline at end of file
......@@ -8,6 +8,8 @@ import { AutorizacionUsuariosComponent } from './autorizacion-usuarios/autorizac
import { AdminComponent } from './admin.component';
import { PermisosUsuariosComponent } from './permisos-usuarios/permisos-usuarios.component';
import { ConfiguracionValoresComponent } from './configuracion-valores/configuracion-valores.component';
import { AdminRouterComponent } from './admin-router/admin-router.component';
import { AngularMaterialModule } from '../../../../material/angular-material.module';
@NgModule({
schemas: [
......@@ -18,12 +20,14 @@ import { ConfiguracionValoresComponent } from './configuracion-valores/configura
AutorizacionUsuariosComponent,
PermisosUsuariosComponent,
ConfiguracionValoresComponent,
AdminRouterComponent,
],
imports: [
RouterModule,
// SharedModule,
CommonModule,
AdminRoutingModule,
AngularMaterialModule,
],
})
export class AdminModule { }
......@@ -8,7 +8,7 @@
<button mat-raised-button color="primary" routerLink="/upload-template">
Tengo la plantilla con los pesos
</button>
<a href="/calculos">¿Qué plantilla?</a>
<a href="/calculos" (click)="downloadFile()">¿Qué plantilla?</a>
</div>
<button mat-raised-button color="primary" routerLink="/stepper">
Quiero subir los datos a mano
......
......@@ -8,4 +8,11 @@ import { Component, OnInit } from '@angular/core';
export class CalculosComponent implements OnInit {
ngOnInit(): void {
}
downloadFile(): void {
let link = document.createElement('a');
link.download = 'PlantillaEstandar';
link.href = 'assets/files/planillaEstandar.xlsx';
link.click();
}
}
......@@ -5,10 +5,10 @@
<div class="col-md-6 right-column">
<div class="titles-div">
<p class="rep-title">REP!</p>
<p class="rep-subtitle">Requerimiento Energético Ponderado</p>
<p class="rep-subtitle">Requerimiento Energético Poblacional</p>
</div>
<p class="rep-info">
Herramienta para el cálculo del requerimiento energético de una persona o población
Herramienta para el cálculo del requerimiento energético de una población
</p>
</div>
</div>
......@@ -26,9 +26,7 @@
font-family: Roboto;
font-style: normal;
font-weight: 500;
font-size: 3vh !important;
line-height: 2rem;
}
}
::ng-deep .mat-button.mat-primary, .mat-icon-button.mat-primary, .mat-stroked-button.mat-primary {
color: white;
......@@ -38,6 +36,4 @@
font-family: Roboto;
font-style: normal;
font-weight: 500;
font-size: 2vh;
line-height: 2rem;
}
\ No newline at end of file
......@@ -10,18 +10,18 @@
<button mat-button color="primary" routerLink="calculos">
CÁLCULOS
</button>
<button mat-button color="primary" routerLink="templates">
<!-- <button mat-button color="primary" routerLink="templates">
PLANTILLAS
</button>
</button> -->
<button mat-button color="primary" routerLink="manuals">
MANUAL FAQ
</button>
<button mat-button color="primary">
<button mat-button color="primary" routerLink="admin">
ADMINISTRACIÓN
</button>
</div>
<div>
<button mat-icon-button>
<button mat-icon-button routerLink="auth">
<mat-icon>account_circle</mat-icon>
</button>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment