Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #22

Merged
merged 107 commits into from
Mar 30, 2020
Merged

Develop #22

merged 107 commits into from
Mar 30, 2020

Commits on Mar 16, 2020

  1. agrego alta, detalle y lista de entrenadores

    fede committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    74a5092 View commit details
    Browse the repository at this point in the history

  2. agrego permisos para que solo admin pueda crear y ver entrenadores

    fede committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    6995e73 View commit details
    Browse the repository at this point in the history

  3. fix que mostraba detalle de entrenador repetido

    fede committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    4ced4d6 View commit details
    Browse the repository at this point in the history

  4. fix de validaciones de creacion de entrenador

    fede committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    24a37ed View commit details
    Browse the repository at this point in the history

  5. modificacion de menu para mostrar seccion de entrenadores con roles

    fede committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    31506d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Basic training service

    @ianspektor
    ianspektor committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    0b31c83 View commit details
    Browse the repository at this point in the history

  2. Corregi "trainning" a training

    @ianspektor
    ianspektor committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    9f8451e View commit details
    Browse the repository at this point in the history

  3. Training controller

    @ianspektor
    ianspektor committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    c4603aa View commit details
    Browse the repository at this point in the history

  4. Opcion Reservations en menu

    @ianspektor
    ianspektor committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    751dc32 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4 from davtorcue/creacion-cancelacion-training 

    Creacion cancelacion training
    Ian Spektor authored Mar 17, 2020
    Configuration menu
    Copy the full SHA
    f9902b7 View commit details
    Browse the repository at this point in the history

  6. Mostrar y añadir trainings

    @ianspektor
    ianspektor committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    41966b8 View commit details
    Browse the repository at this point in the history

  7. Quite opcion de error en el menu

    @ianspektor
    ianspektor committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    ceaad1c View commit details
    Browse the repository at this point in the history

  8. agrego tests de trainer service

    fede committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    dc4c5e9 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. agrego test de trainer controller

    fede committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    61f6ad4 View commit details
    Browse the repository at this point in the history

  2. agrego validacion de email a employee

    fede committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    cbececc View commit details
    Browse the repository at this point in the history

  3. agrego validacion de salario positivo en employee

    fede committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    71c4b2c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'creacion-entrenador' into develop

    fede committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    c4ae09e View commit details
    Browse the repository at this point in the history

  5. agrego busqueda por apellido a entrenadores

    fede committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    97c87ff View commit details
    Browse the repository at this point in the history

  6. Merge branch 'busqueda-entrenadores-apellido' into develop

    fede committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    346dcc2 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. Merge pull request #5 from davtorcue/develop 

    Develop
    @jospearui
    jospearui authored Mar 21, 2020
    Configuration menu
    Copy the full SHA
    44cca61 View commit details
    Browse the repository at this point in the history

  2. Comentarios de ayudantia y comence a cambiar reservations a MY reserv… 

    …ations
    @ianspektor
    ianspektor committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    f6c0bb3 View commit details
    Browse the repository at this point in the history

  3. Create y update ok. Revisar ui, aforo y asociacion reserva-pet

    @jospearui
    jospearui committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    1f077ec View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into creacion-cancelacion-training

    @ianspektor
    ianspektor committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    a3d7250 View commit details
    Browse the repository at this point in the history

  5. Cancelar trainings

    @ianspektor
    ianspektor committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    c2b6243 View commit details
    Browse the repository at this point in the history

  6. Editar trainings

    @ianspektor
    ianspektor committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    037df45 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #6 from davtorcue/creacion-cancelacion-training 

    Creacion cancelacion training
    Ian Spektor authored Mar 21, 2020
    Configuration menu
    Copy the full SHA
    0b21a16 View commit details
    Browse the repository at this point in the history

  8. Training service tests

    @ianspektor
    ianspektor committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    bed4b97 View commit details
    Browse the repository at this point in the history

  9. Cambie restricciones de Training y Booking

    @ianspektor
    ianspektor committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    282a2be View commit details
    Browse the repository at this point in the history

  10. Implementacion de borrado y listado de daycares

    @alorodlla
    alorodlla committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    bf3beb7 View commit details
    Browse the repository at this point in the history

  11. TrainingController tests

    @ianspektor
    ianspektor committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    d693749 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #8 from davtorcue/training-test 

    Training test
    Ian Spektor authored Mar 21, 2020
    Configuration menu
    Copy the full SHA
    a69d33f View commit details
    Browse the repository at this point in the history

  13. Merge branch 'listado-y-borrado-de-guardería' into creacion-y-modific… 

    …acion-guarderia
    @alorodlla
    alorodlla authored Mar 21, 2020
    Configuration menu
    Copy the full SHA
    1e76980 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #7 from davtorcue/creacion-y-modificacion-guarderia 

    Creacion y modificacion guarderia
    @alorodlla
    alorodlla authored Mar 21, 2020
    Configuration menu
    Copy the full SHA
    1f8b482 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2020

  1. Merge remote-tracking branch 'origin/develop' into listado-y-borrado-… 

    …de-guardería
    @alorodlla
    alorodlla committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    4fe5118 View commit details
    Browse the repository at this point in the history

  2. Modifique datos precargados para que cada owner tenga su user

    @ianspektor
    ianspektor committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    69d0b33 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. agrego valdocacion de username y pass not null en owner

    fede committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    691d525 View commit details
    Browse the repository at this point in the history

  2. agrego validacion para que el username del user sea unico

    fede committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    57d96c9 View commit details
    Browse the repository at this point in the history

  3. agrego tests de userService

    fede committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    3dc0c8c View commit details
    Browse the repository at this point in the history

  4. Delete de hairdressing hecho 

    el delete está hecho pero la creación da fallos
    @antmarcab4
    antmarcab4 committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    eb64cd9 View commit details
    Browse the repository at this point in the history

  5. agrego tests de users

    fede committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    305b71f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'user-fix' into develop

    fede committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    001418a View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Cambie input de date en training por un datepicker

    @ianspektor
    ianspektor committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    40f31f9 View commit details
    Browse the repository at this point in the history

  2. Cambie input de tipo pista por un select

    @ianspektor
    ianspektor committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    4f6759c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9 from davtorcue/corregir-inputs-training 

    Corregir inputs training
    @ianspektor
    ianspektor authored Mar 24, 2020
    Configuration menu
    Copy the full SHA
    afdd67b View commit details
    Browse the repository at this point in the history

  4. muestro lista de entrenadores al ingresar a la pantalla del listado

    fede committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    3be8866 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'fix-owners-list' into develop

    fede committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    20b7071 View commit details
    Browse the repository at this point in the history

  6. cambios en la home y nombre de interfaz

    fede committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    9600e81 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'cambios-interfaz' into develop

    fede committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    eefff7f View commit details
    Browse the repository at this point in the history

  8. hecho create y delete 

    create hecho bien, delete funciona raro y el show hay que retocarlo porque no muestra bien los hairdressing appointments
    @antmarcab4
    antmarcab4 committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    3b4b41b View commit details
    Browse the repository at this point in the history

  9. Creation y listing de daycare 

    Añadidas las funcionalidades crear y listar, pero continuan existiendo problemas en el borrado y la edicion
    @alorodlla
    alorodlla committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    c9117b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. fix para poder eliminar un hairdressing

    fede committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    029b986 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. Merge pull request #10 from davtorcue/develop 

    Develop
    @davtorcue
    davtorcue authored Mar 26, 2020
    Configuration menu
    Copy the full SHA
    ab8406a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from davtorcue/corregir-relacion-user-owner 

    Modifique datos precargados para que cada owner tenga su user
    @ianspektor
    ianspektor authored Mar 26, 2020
    Configuration menu
    Copy the full SHA
    700983a View commit details
    Browse the repository at this point in the history

  3. fix para borrar daycares

    fede committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    b133284 View commit details
    Browse the repository at this point in the history

  4. fix para actualizar daycares

    fede committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    0aaf2c8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/davtorcue/spring-petclinic… 

    … into listado-y-borrado-de-guardería
    fede committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    59a50b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. elimino codigo innecesario

    fede committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    b632841 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. Merge pull request #12 from davtorcue/listado-y-borrado-de-guardería 

    Listado y borrado de guardería
    @jospearui
    jospearui authored Mar 28, 2020
    Configuration menu
    Copy the full SHA
    48124b6 View commit details
    Browse the repository at this point in the history

  2. Una parte arreglada

    @davtorcue
    davtorcue committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    ab400d4 View commit details
    Browse the repository at this point in the history

  3. fix borrado

    fede committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    afe97a1 View commit details
    Browse the repository at this point in the history

  4. Hecho todo, falta validación time

    @antmarcab4
    antmarcab4 committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    2762a56 View commit details
    Browse the repository at this point in the history

  5. arreglada validación de time

    @antmarcab4
    antmarcab4 committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    fbf2f34 View commit details
    Browse the repository at this point in the history

  6. Restriciones 

    Añadidas las restricciones de aforo, numero de reservas, fechas en el futuro y borrado con menos de 24 horas de antelación
    @alorodlla
    alorodlla committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    aeda7e8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #13 from fedesartu/listado-y-borrado-de-guardería 

    Restriciones
    @jospearui
    jospearui authored Mar 28, 2020
    Configuration menu
    Copy the full SHA
    16c2089 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2020

  1. últimos cambios realizados

    @davtorcue
    davtorcue committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    39c3f4d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/davtorcue/spring-petclinic… 

    … into actualizar-consultar-entrenamientos
    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    f73a120 View commit details
    Browse the repository at this point in the history

  3. agrego datos pruebas para hacerlas mas rapidas

    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    c8e0b2a View commit details
    Browse the repository at this point in the history

  4. fix para poder agregar entrenador en add y udate de training

    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    0b1290e View commit details
    Browse the repository at this point in the history

  5. fix de borrado de training

    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    07c56ba View commit details
    Browse the repository at this point in the history

  6. cambios de interfaz

    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    d1850fa View commit details
    Browse the repository at this point in the history

  7. test fixes

    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    1be321b View commit details
    Browse the repository at this point in the history

  8. agrego validacion para que un entrenador no tenga 2 entrenamientos en… 

    … la misma fecha
    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    aa7f82c View commit details
    Browse the repository at this point in the history

  9. fix tests

    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    c6c980f View commit details
    Browse the repository at this point in the history

  10. agrego validacion para que fecha de entrenamiento sea futura

    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    b69f847 View commit details
    Browse the repository at this point in the history

  11. Añadida la clase HairdressingServiceTest

    prada committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    8346723 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #14 from fedesartu/creacion-cancelacion-hairdressing 

    Nuevas clases para testear.
    @enprava
    enprava authored Mar 29, 2020
    Configuration menu
    Copy the full SHA
    7d5f6b7 View commit details
    Browse the repository at this point in the history

  13. retoques en vista y validación de delete

    @antmarcab4
    antmarcab4 committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    d309d2d View commit details
    Browse the repository at this point in the history

  14. Tests servicio controlador y una restriccion controlador

    @jospearui
    jospearui committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    8c522a4 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #15 from fedesartu/test-guarderia 

    Tests guarderia
    @jospearui
    jospearui authored Mar 29, 2020
    Configuration menu
    Copy the full SHA
    6ae1f1b View commit details
    Browse the repository at this point in the history

  16. fix validacion de fecha y validacion de mismo entrenador y fecha

    fede committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    ed3803a View commit details
    Browse the repository at this point in the history

  17. Merge branch 'develop' into creacion-cancelacion-hairdressing

    @antmarcab4
    antmarcab4 authored Mar 29, 2020
    Configuration menu
    Copy the full SHA
    a17e7d3 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #16 from fedesartu/creacion-cancelacion-hairdressing 

    Creacion cancelacion hairdressing
    @antmarcab4
    antmarcab4 authored Mar 29, 2020
    Configuration menu
    Copy the full SHA
    c650afc View commit details
    Browse the repository at this point in the history

  19. Merge branch 'develop' into actualizar-consultar-entrenamientos

    @davtorcue
    davtorcue authored Mar 29, 2020
    Configuration menu
    Copy the full SHA
    3d35465 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #17 from fedesartu/actualizar-consultar-entrenamie… 

    …ntos

Actualizar consultar entrenamientos
    @davtorcue
    davtorcue authored Mar 29, 2020
    Configuration menu
    Copy the full SHA
    b0232c4 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. fixes

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    da88573 View commit details
    Browse the repository at this point in the history

  2. Correcciones a daycare 

    Solucionados algunos bugs en el código
    @alorodlla
    alorodlla committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    985c664 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #18 from fedesartu/correcciones-daycare 

    Correcciones a daycare
    @alorodlla
    alorodlla authored Mar 30, 2020
    Configuration menu
    Copy the full SHA
    9170120 View commit details
    Browse the repository at this point in the history

  4. fix vista detalle owner

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    19d6546 View commit details
    Browse the repository at this point in the history

  5. fix mensaje error telefono

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    e394ad4 View commit details
    Browse the repository at this point in the history

  6. Correccion borrado daycare 

    Resuelto error en el borrado de daycare
    @alorodlla
    alorodlla committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    c3b473e View commit details
    Browse the repository at this point in the history

  7. paso de rama

    @davtorcue
    davtorcue committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    9638ea5 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #19 from fedesartu/correccion-borrado-daycare 

    Correccion borrado daycare
    @alorodlla
    alorodlla authored Mar 30, 2020
    Configuration menu
    Copy the full SHA
    84e4c98 View commit details
    Browse the repository at this point in the history

  9. fix vistas trainings

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    2b21b16 View commit details
    Browse the repository at this point in the history

  10. merge dev

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    f9923e7 View commit details
    Browse the repository at this point in the history

  11. fix merge

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    c493a62 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'fixes' into develop

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    1a8fdf3 View commit details
    Browse the repository at this point in the history

  13. changed utf

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    f535ba9 View commit details
    Browse the repository at this point in the history

  14. Hairdressings test comit 1.

    prada committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    ed26307 View commit details
    Browse the repository at this point in the history

  15. Test arreglados

    @davtorcue
    davtorcue committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    c79e32f View commit details
    Browse the repository at this point in the history

  16. Merge pull request #20 from fedesartu/cambios-develop 

    Cambios develop
    @davtorcue
    davtorcue authored Mar 30, 2020
    Configuration menu
    Copy the full SHA
    1213ea5 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'develop' of https://github.com/davtorcue/spring-petclinic… 

    … into travis-tests
    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    a9def2e View commit details
    Browse the repository at this point in the history

  18. Merge branch 'travis-tests' into develop

    fede committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    b4dbcf6 View commit details
    Browse the repository at this point in the history

  19. Hairdressing tests commit 2

    prada committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    5061052 View commit details
    Browse the repository at this point in the history

  20. Hairdressing test commit 3

    prada committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    7fa9560 View commit details
    Browse the repository at this point in the history

  21. Hairdressing-test commit 4

    prada committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    ad7710f View commit details
    Browse the repository at this point in the history

  22. Hairdressing test commit 5

    prada committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    e89a94e View commit details
    Browse the repository at this point in the history

  23. Merge pull request #21 from fedesartu/hairdressing-test 

    Hairdressing test
    @enprava
    enprava authored Mar 30, 2020
    Configuration menu
    Copy the full SHA
    fd321f0 View commit details
    Browse the repository at this point in the history