Skip to content

Commit

Permalink
Merge pull request #28 from rpuigm/F019_B019_Funcionalicades_Pendient…
Browse files Browse the repository at this point in the history 
…es_Y_Aspecto_Visual

F019 b019 funcionalicades pendientes y aspecto visual
  • Loading branch information
@rpuigm
rpuigm authored Dec 5, 2021
2 parents a1f8ae3 + 782b544 commit 9118110
Show file tree
Hide file tree
Showing 57 changed files with 1,044 additions and 327 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## [0.8.0-alpha.1] (2021-12-05)

### Fixed

- #Se puede modificar el nombre de la tienda.
- #Se puede eliminar imagen
- #Se puede eliminar producto
- #Se puede despachar pedido
- #Se ha mejorado el aspecto visual

## [0.7.0-alpha.1] (2021-12-02)

### Fixed
Expand Down
131 changes: 68 additions & 63 deletions clientes-app/src/app/altapersona/altapersona.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,76 @@
<app-header></app-header>
<div class="row">
<div class="container">
<p></p>
<p></p>
<p></p>
<p></p>
</div>
<form>
<div class="form-row">
<div class="col-md-4 mb-3">
<label>Username</label>
<input
type="text"
class="form-control"
placeholder="Nombre Usuario"
[(ngModel)]="getUsuario().username"
name="username"
id="username"
/>
</div>
<div class="col-md-4 mb-3">
<label>Contraseña</label>
<input
type="password"
class="form-control"
placeholder="Password"
(input) = 'setUsuarioPass($event)'
name="password"
id="password"
/>
</div>

<div class="col-md-4 mb-3">
<label>Nombre</label>
<input
type="text"
class="form-control"
placeholder="Nombre"
[(ngModel)]="usuario.nombre"
name="nombre"
id="nombre"
/>
</div>
<div class="row card ">
<div class="col-0 col-sm-4"></div>
<div class="card-body ">
<form class="p-3">
<div class="form-row">
<div class="col-md-4 mb-3">
<label>Username</label>
<input
type="text"
class="form-control"
placeholder="Nombre Usuario"
[(ngModel)]="getUsuario().username"
name="username"
id="username"
/>
</div>
<div class="col-md-4 mb-3">
<label>Contraseña</label>
<input
type="password"
class="form-control"
placeholder="Password"
(input)="setUsuarioPass($event)"
name="password"
id="password"
/>
</div>

<div class="col-md-4 mb-3">
<label>Nombre</label>
<input
type="text"
class="form-control"
placeholder="Nombre"
[(ngModel)]="usuario.nombre"
name="nombre"
id="nombre"
/>
</div>

<div class="col-md-4 mb-3">
<label>Apellidos</label>
<input
type="text"
class="form-control"
placeholder="Apellidos"
[(ngModel)]="usuario.apellidos"
name="apellido"
id="apellido"
/>
</div>
<div class="col-md-4 mb-3">
<label>Edad</label>
<input
type="text"
class="form-control"
placeholder="Edad"
[(ngModel)]="usuario.edad"
name="edad"
id="edad"
/>
</div>
<div class="col-md-4 mb-3">
<label>Apellidos</label>
<input
type="text"
class="form-control"
placeholder="Apellidos"
[(ngModel)]="usuario.apellidos"
name="apellido"
id="apellido"
/>
</div>
<div class="col-md-4 mb-3">
<label>Edad</label>
<input
type="text"
class="form-control"
placeholder="Edad"
[(ngModel)]="usuario.edad"
name="edad"
id="edad"
/>
</div>
</div>
<button (click)="altaCliente()" class="btn btn-primary" type="submit">
Guardar
</button>
</form>
</div>
<button (click)="altaCliente()" class="btn btn-primary" type="submit">
Guardar
</button>
</form>
</div>
2 changes: 0 additions & 2 deletions clientes-app/src/app/altapersona/altapersona.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ export class AltapersonaComponent implements OnInit {
constructor(
private altaPersonaService: AltaPersonaService,
private router: Router,
private personaService: PersonaServices,
private empleadoService: EmpleadoService
) {}

ngOnInit(): void {
Expand Down
183 changes: 103 additions & 80 deletions clientes-app/src/app/altaproducto/altaproducto.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,98 +1,121 @@
<app-header></app-header>
<div class="container">
<div class="row">
<p></p>
<p></p>
<p></p>
<p></p>
</div>
<form >
<div class="row card">

<div class="form-group row">
<div class="col-2">
<label>Nombre</label>
</div>
<div class="col-7">
<input type="text" class="form-control" (input) = 'setProductoNombre($event)' >
</div>
</div>
<div class="form-group row">
<div class="col-7">
<label>Categoria</label>
<input type="text" class="form-control" (input) = 'setProductoCategoria($event)' >
<form>
<div class="form-group row">
<label>Nombre</label>
<div class="col-7">
<input
type="text"
class="form-control"
(input)="setProductoNombre($event)"
/>
</div>
</div>
<div class="form-group row">
<div class="col-7">
<label>Categoria</label>
<input
type="text"
class="form-control"
(input)="setProductoCategoria($event)"
/>
</div>

<label>Precio</label>
<div class="col-sm-2">
<input type="text" class="form-control" (input) = 'setProductoPrecio($event)' >
<div class="col-12"></div>
<label>Precio</label>
<div class="col-sm-2">
<input
type="text"
class="form-control"
(input)="setProductoPrecio($event)"
/>
<div class="col-12"></div>
</div>
</div>
</div>

<div class="form-group row">
<label>Descripción del Producto</label>
<div class="col-sm-10">
<input type="text" class="form-control" (input) = 'setProductoCaracteristicasDescripcion($event)' >
<div class="col-12"></div>
<div class="form-group row">
<label>Descripción del Producto</label>
<div class="col-sm-10">
<input
type="text"
class="form-control"
(input)="setProductoCaracteristicasDescripcion($event)"
/>
<div class="col-12"></div>
</div>
</div>
</div>


<div class="form-group row">
<label>Clave de Especificacion</label>
<div class="col-sm-10">
<input type="text" class="form-control" (input) = 'setProductoClaveEspecificacion($event)' >
<div class="col-12"></div>
<div class="form-group row">
<label>Clave de Especificacion</label>
<div class="col-sm-10">
<input
type="text"
class="form-control"
(input)="setProductoClaveEspecificacion($event)"
/>
<div class="col-12"></div>
</div>
</div>
</div>
<div class="form-group row">
<label>Especificacion</label>
<div class="col-sm-10">
<input type="text" class="form-control" (input) = 'setProductoEspecificacion($event)' >
<div class="col-12"></div>
<div class="form-group row">
<label>Especificacion</label>
<div class="col-sm-10">
<input
type="text"
class="form-control"
(input)="setProductoEspecificacion($event)"
/>
<div class="col-12"></div>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-sm-10 offset-sm-2">
<button type="submit" class="btn btn-primary"
(click)="agregarEspecificacion()">Agregar Especificacion</button>
<div class="form-group row">
<div class="col-sm-10 offset-sm-2 p-3">
<button
type="submit"
class="btn btn-primary"
(click)="agregarEspecificacion()"
>
Agregar Especificacion
</button>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-sm-10 offset-sm-2">
<button type="submit" class="btn btn-primary"
(click)="agregarProducto()">Guardar</button>
<div class="form-group row">
<div class="col-sm-10 offset-sm-2">
<button
type="submit"
class="btn btn-primary"
(click)="agregarProducto()"
>
Guardar
</button>
</div>
</div>
</div>
</form>


</form>

<div class="col-6">
<div class="row">

<div *ngIf="getProducto()?.productoCaracteristicas">
<table class="table table-responsive">
<thead>
<tr>
<th class="col-2">Espicificación</th>
<th class="col-10">Descripción</th>
</tr>
</thead>
<tbody
*ngFor="
let especificacion of producto.productoCaracteristicas
.productoEspecificaciones">
<tr>
<td>{{ especificacion.claveEspecificacion }}</td>
<td>{{ especificacion.descripcionEspecificacion }}</td>
</tr>
</tbody>
</table>
</div>
<div class="col-6">
<div class="row">
<div *ngIf="getProducto()?.productoCaracteristicas">
<table class="table table-responsive">
<thead>
<tr>
<th class="col-2">Espicificación</th>
<th class="col-10">Descripción</th>
</tr>
</thead>
<tbody
*ngFor="
let especificacion of producto.productoCaracteristicas
.productoEspecificaciones
"
>
<tr>
<td>{{ especificacion.claveEspecificacion }}</td>
<td>{{ especificacion.descripcionEspecificacion }}</td>
</tr>
</tbody>
</table>
</div>
</div>

</div>
</div>
<app-footer></app-footer>

10 changes: 8 additions & 2 deletions clientes-app/src/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import { ProductoCestaComponent } from './producto-cesta/producto-cesta.componen
import { DireccionPedidoComponent } from './direccion-pedido/direccion-pedido.component';
import { PasarelaComponent } from './pasarela/pasarela.component';
import { ListaPedidosComponent } from './lista-pedidos/lista-pedidos.component';
import { DespachoComponent } from './despacho/despacho.component';
import { ConfiguracionComponent } from './configuracion/configuracion.component';

const routes: Routes = [
{path:'', redirectTo:'/productosgrid', pathMatch: 'full'},
Expand All @@ -47,7 +49,9 @@ const routes: Routes = [
{path:'cesta', component: CestaComponent},
{path:'direccion/:id', component: DireccionPedidoComponent},
{path:'pasarela/:id', component: PasarelaComponent},
{path:'listapedidos', component: ListaPedidosComponent}
{path:'listapedidos', component: ListaPedidosComponent},
{path:'despacho', component: DespachoComponent},
{path:'configuracion', component: ConfiguracionComponent}
];

@NgModule({
Expand All @@ -74,7 +78,9 @@ const routes: Routes = [
ProductoCestaComponent,
DireccionPedidoComponent,
PasarelaComponent,
ListaPedidosComponent
ListaPedidosComponent,
DespachoComponent,
ConfiguracionComponent

],
imports: [
Expand Down
Empty file added clientes-app/src/app/configuracion/configuracion.component.css
View file
Empty file.
Loading

0 comments on commit 9118110

Please sign in to comment.