This repository was archived by the owner on Jul 24, 2024. It is now read-only.
Integracão reserva api #9
Merged
Conversation
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
estacioneto
suggested changes
Jul 19, 2017
| posSalvar(data); | ||
| return self.reserva.salvar().then(data => { | ||
| AgendamentoService.salvarReserva(self.reserva); | ||
| posSalvar(); |
There was a problem hiding this comment.
Toaster para notificar sucesso
| @@ -39,38 +41,57 @@ let sequenceReserva = 1; | |||
| corTexto}); | |||
| } | |||
|
|
|||
| function obterPropriedades(instancia, props) { | |||
| if (indiceReserva !== -1) { | ||
| // atualizar | ||
| mock.splice(indiceReserva, 1, new Reserva(reserva)); | ||
| reservas.splice(indiceReserva, 1, new Reserva(reserva)); |
There was a problem hiding this comment.
Testa se isso anida funciona
There was a problem hiding this comment.
Realmente precisa, documentei como funciona.
| */ | ||
| function getIndiceReserva(lista, reserva) { | ||
| function getIndiceReserva(lista, id) { | ||
| for (let i = 0; i < lista.length; i++) { |
There was a problem hiding this comment.
| }); | ||
|
|
||
| return promiseEventosFuturos.then(reservasRes => { | ||
| let reservasDia = reservasRes.filter(r => r.dia === data); |
| @@ -110,79 +80,26 @@ | |||
| * @return {Promise} Promessa contendo a reserva. | |||
| */ | |||
| this.getReserva = id => { | |||
| let indiceReserva = getIndiceReserva(mock, {id}); | |||
| return $q.when(mock[indiceReserva]); | |||
| let indiceReserva = getIndiceReserva(reservas, id); | |||
| let indiceReserva = getIndiceReserva(mock, {id}); | ||
| return $q.when(mock[indiceReserva]); | ||
| let indiceReserva = getIndiceReserva(reservas, id); | ||
| return $q.when(reservas[indiceReserva]); |
There was a problem hiding this comment.
Precisa da promise? ficou em aberto do último review
estacioneto
suggested changes
Jul 19, 2017
| if (r._id.toString() === reserva._id) { | ||
| continue; | ||
| } | ||
| if (r.fim > inicio && r.inicio < inicio |
There was a problem hiding this comment.
Extrair condição para função
Repository owner
deleted a comment from
estacioneto
Jul 19, 2017
velmer
reviewed
Jul 19, 2017
| const caso2 = inicio < r.fim && fim > r.fim; | ||
| const caso3 = inicio >= r.inicio && fim <= r.fim; | ||
| const caso4 = inicio <= r.inicio && fim >= r.fim; | ||
| if (caso1 || caso2 || caso3 || caso4) { |
There was a problem hiding this comment.
Dá uma olhada nesses casos que eu tinha montado, creio que dá pra cobrir todos apenas com 3 condições. Seria bacana extrair para um método: causaChoqueDeHorario(reserva), por exemplo
| let indiceReserva = getIndiceReserva(mock, {id}); | ||
| return $q.when(mock[indiceReserva]); | ||
| let indiceReserva = getIndiceReserva(reservas, id); | ||
| return $q.when(reservas[indiceReserva]); |
There was a problem hiding this comment.
Precisa da promise? ficou em aberto do último review
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.