-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/dev' into carlos
- Loading branch information
Showing
44 changed files
with
1,228 additions
and
427 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| Manifest-Version: 1.0 | ||
| Implementation-Title: appSpring | ||
| Implementation-Version: 0.0.1 | ||
| Built-By: jherel | ||
| Implementation-Vendor-Id: es.urjc.daw | ||
| Build-Jdk: 1.8.0_121 | ||
| Implementation-URL: http://projects.spring.io/spring-boot/appSpring/ | ||
| Created-By: Maven Integration for Eclipse | ||
| Implementation-Vendor: Pivotal Software, Inc. | ||
| Main-Class: appSpring.Application | ||
|
|
Binary file not shown.
Binary file modified
BIN
-81 Bytes
(99%)
backend/target/classes/appSpring/service/LogicService.class
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| server.port = 8443 | ||
| server.ssl.key-store = classpath:keystore.jks | ||
| server.ssl.key-store-password = password | ||
| server.ssl.key-password = secret | ||
| spring.h2.console.enabled=true | ||
|
|
||
| spring.datasource.url = jdbc:mysql://localhost/brems?verifyServerCertificate=false&useSSL=true | ||
| spring.datasource.username = root | ||
| spring.datasource.password = root | ||
| spring.datasource.driverClassName = com.mysql.jdbc.Driver | ||
| spring.jpa.hibernate.ddl-auto = create-drop | ||
|
|
||
| spring.mail.host = smtp.gmail.com | ||
| spring.mail.port = 587 | ||
| spring.mail.username = bremslibrerias@gmail.com | ||
| spring.mail.password = BrEmSbReMs7102 | ||
|
|
||
| spring.mail.properties.mail.smtp.auth = true | ||
| spring.mail.properties.mail.smtp.socketFactory.port = 465 | ||
| spring.mail.properties.mail.smtp.starttls.required = false | ||
| spring.mail.properties.mail.smtp.starttls.enable = true | ||
| spring.mail.properties.mail.smtp.socketFactory.class = javax.net.ssl.SSLSocketFactory | ||
| spring.mail.properties.mail.smtp.socketFactory.fallback = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| #Generated by Apache Maven | ||
| #Fri Apr 07 18:09:30 CEST 2017 | ||
| #Sun Apr 23 00:32:37 CEST 2017 | ||
| version=0.0.1 | ||
| groupId=es.urjc.daw | ||
| artifactId=appSpring |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,48 @@ | ||
| import {NgModule} from '@angular/core'; | ||
| import {CommonModule} from '@angular/common'; | ||
| import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; | ||
| import {FormsModule} from '@angular/forms'; | ||
| import { NgModule } from '@angular/core'; | ||
| import { FormsModule, ReactiveFormsModule } from '@angular/forms'; | ||
| import { CommonModule } from '@angular/common'; | ||
| import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; | ||
|
|
||
| import {AdminComponent} from './admin.component'; | ||
| import { AdminComponent } from './admin.component'; | ||
|
|
||
| import {AdminRoutingModule} from './admin-routing.module'; | ||
| import {HeaderComponent} from './header/header.component'; | ||
| import {SidebarComponent} from './sidebar/sidebar.component'; | ||
| import {ManageResourcesComponent} from './manage-resources/manage-resources.component'; | ||
| import {EditResourceComponent} from './manage-resources/edit/edit.component'; | ||
| import {EditUserComponent} from './manage-users/edit/edit.component'; | ||
| import {ManageLoansComponent} from './manage-loans/manage-loans.component'; | ||
| import {ManageFinesComponent} from './manage-fines/manage-fines.component'; | ||
| import {CreateUserComponent} from './manage-users/create/create.component'; | ||
| import {ManageUsersComponent} from './manage-users/manage-users.component'; | ||
| import {DashboardComponent} from './dashboard/dashboard.component'; | ||
| import { AdminRoutingModule } from './admin-routing.module'; | ||
| import { HeaderComponent } from './header/header.component'; | ||
| import { SidebarComponent } from './sidebar/sidebar.component'; | ||
|
|
||
| import { ManageResourcesComponent } from './manage-resources/manage-resources.component'; | ||
| import { EditResourceComponent } from './manage-resources/edit/edit.component'; | ||
| import { CreateResourceComponent } from './manage-resources/create/create.component'; | ||
|
|
||
| import { EditUserComponent } from './manage-users/edit/edit.component'; | ||
| import { ManageLoansComponent } from './manage-loans/manage-loans.component'; | ||
| import { CreateLoanComponent } from './manage-loans/create/create.component'; | ||
| import { ManageFinesComponent } from './manage-fines/manage-fines.component'; | ||
| import { CreateUserComponent } from './manage-users/create/create.component'; | ||
| import { ManageUsersComponent } from './manage-users/manage-users.component'; | ||
| import { DashboardComponent } from './dashboard/dashboard.component'; | ||
|
|
||
| @NgModule({ | ||
| imports: [ | ||
| CommonModule, | ||
| AdminRoutingModule, | ||
| NgbModule, | ||
| FormsModule | ||
| ], | ||
| declarations: [ | ||
| AdminComponent, | ||
| HeaderComponent, | ||
| SidebarComponent, | ||
| ManageResourcesComponent, | ||
| EditResourceComponent, | ||
| ManageLoansComponent, | ||
| ManageFinesComponent, | ||
| CreateUserComponent, | ||
| EditUserComponent, | ||
| ManageUsersComponent, | ||
| DashboardComponent | ||
| ] | ||
| imports: [ | ||
| CommonModule, | ||
| AdminRoutingModule, | ||
| FormsModule, | ||
| ReactiveFormsModule | ||
| ], | ||
| declarations: [ | ||
| AdminComponent, | ||
| HeaderComponent, | ||
| SidebarComponent, | ||
| DashboardComponent, | ||
| ManageResourcesComponent, | ||
| EditResourceComponent, | ||
| ManageLoansComponent, | ||
| CreateLoanComponent, | ||
| ManageFinesComponent, | ||
| ManageUsersComponent, | ||
| CreateUserComponent, | ||
| EditUserComponent, | ||
| CreateResourceComponent | ||
| ] | ||
| }) | ||
| export class AdminModule { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
frontend/src/app/component/admin/manage-loans/create/create.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <div *ngIf="errorMessage" class="alert alert-danger"> | ||
| <strong>Algo ha ido mal...</strong> {{message}} | ||
| </div> | ||
|
|
||
| <section class="content-header"> | ||
| <h1>Administración de préstamos <small>Administra los préstamos de los recursos</small></h1> | ||
| <ol class="breadcrumb"> | ||
| <li><a [routerLink]="['/admin']"><i class="fa fa-dashboard"></i> Inicio</a></li> | ||
| <li><a [routerLink]="['/admin/loans']">Préstamo</a></li> | ||
| <li class="active">Añadir préstamo</li> | ||
| </ol> | ||
| </section> | ||
|
|
||
| <section class="content"> | ||
| <div class="box box-default"> | ||
| <div class="box-header with-border"> | ||
| <h3 class="box-title">Nuevo préstamo</h3> | ||
| </div> | ||
| <div class="box-body"> | ||
| <div class="row"> | ||
| <div class="col-lg-8"> | ||
| <div class="form-group"> | ||
| <label>Recursos disponibles a prestar</label> | ||
| <br> | ||
| <select [(ngModel)]="resourceSelect"> | ||
| <ng-template ngFor let-resource [ngForOf]="resources"> | ||
| <option *ngIf="resource.noReservedCopies.length > 0" [ngValue]="resource">{{resource.title}}</option> | ||
| </ng-template> | ||
| </select> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label>Usuario</label> | ||
| <br> | ||
| <select [(ngModel)]="userSelect"> | ||
| <option *ngFor="let user of users" [ngValue]="user">{{user.name}}</option> | ||
| </select> | ||
| </div> | ||
| <br> | ||
| <div class="pull-left"> | ||
| <input type="submit" class="btn btn-success" (click)="createLoan()"> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> |
Oops, something went wrong.