From 4d2b11cf4205739c1b39c8605c830f8337300ff6 Mon Sep 17 00:00:00 2001 From: LoreNa Date: Fri, 2 Oct 2020 19:30:02 -0500 Subject: [PATCH 1/3] Punto 1 Reto 2 JS --- ...EMPLATE.md\t" => PULL_REQUEST_TEMPLATE.md_ | 8 ++++---- src/index.js | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 7 deletions(-) rename "PULL_REQUEST_TEMPLATE.md\t" => PULL_REQUEST_TEMPLATE.md_ (55%) diff --git "a/PULL_REQUEST_TEMPLATE.md\t" b/PULL_REQUEST_TEMPLATE.md_ similarity index 55% rename from "PULL_REQUEST_TEMPLATE.md\t" rename to PULL_REQUEST_TEMPLATE.md_ index 9a4d861..d037e26 100644 --- "a/PULL_REQUEST_TEMPLATE.md\t" +++ b/PULL_REQUEST_TEMPLATE.md_ @@ -1,9 +1,9 @@ ## DESCRIPTION -Solución al reto 04 de Escuela de JavaScript +Solución al reto 02 de Escuela de JavaScript -Nombre: -Usuario Platzi: +Nombre: Lorena Mosquera González +Usuario Platzi: @LoreBratt ## GRUPO - [ ] Martes @@ -11,7 +11,7 @@ Usuario Platzi: - [ ] Jueves ## Reto: - - [ ] Primer problema + - [X] Primer problema - [ ] Segundo problema - [ ] Tercer problema - [ ] Cuarto Problema (Opcional) \ No newline at end of file diff --git a/src/index.js b/src/index.js index 4c965e7..1eb56c3 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,22 @@ +const randomTime = (min, max) => { + min = Math.ceil(min); + max = Math.floor(max); + return Math.floor(MAth.random() * (max - min + 1) + min); +} + + + + const orders = (time, product, table) => { console.log(`### Orden: ${product} para ${table}`); return new Promise((resolve, reject) => { - setTimeout(() => { - resolve(`=== Pedido servido: ${product}, tiempo de preparación ${time}ms para la ${table}`); - }, time); + try{ + setTimeout(() => { + resolve(`=== Pedido servido: ${product}, preparación ${time}ms para la ${table}`); + }, time); + }catch(err){ + reject(`Error during setup: ${err}`); + } }); } From d788eebf7a920a9547c98a02b2bb92841998ca8d Mon Sep 17 00:00:00 2001 From: LoreNa Date: Fri, 2 Oct 2020 19:49:50 -0500 Subject: [PATCH 2/3] Punto 2 Reto 2 JS --- PULL_REQUEST_TEMPLATE.md_ | 4 ++-- src/index.js | 32 ++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md_ b/PULL_REQUEST_TEMPLATE.md_ index d037e26..8d49c83 100644 --- a/PULL_REQUEST_TEMPLATE.md_ +++ b/PULL_REQUEST_TEMPLATE.md_ @@ -11,7 +11,7 @@ Usuario Platzi: @LoreBratt - [ ] Jueves ## Reto: - - [X] Primer problema - - [ ] Segundo problema + - [ ] Primer problema + - [X] Segundo problema - [ ] Tercer problema - [ ] Cuarto Problema (Opcional) \ No newline at end of file diff --git a/src/index.js b/src/index.js index 1eb56c3..b3ce881 100644 --- a/src/index.js +++ b/src/index.js @@ -1,22 +1,20 @@ const randomTime = (min, max) => { min = Math.ceil(min); max = Math.floor(max); - return Math.floor(MAth.random() * (max - min + 1) + min); + return Math.floor(Math.random() * (max - min + 1) + min); //The maximum is inclusive and the minimum is inclusive } - - - const orders = (time, product, table) => { console.log(`### Orden: ${product} para ${table}`); return new Promise((resolve, reject) => { - try{ - setTimeout(() => { - resolve(`=== Pedido servido: ${product}, preparación ${time}ms para la ${table}`); - }, time); - }catch(err){ - reject(`Error during setup: ${err}`); - } + try{ + setTimeout(() => { + resolve(`=== Pedido servido: ${product}, tiempo de preparación ${time}ms para la ${table}`); + }, time); + }catch(err){ + reject(`Error durante la entrega del pedido: ${err}`); + } + }); } @@ -29,9 +27,19 @@ const menu = { const table = ['Mesa 1', 'Mesa 2', 'Mesa 3', 'Mesa 4', 'Mesa 5']; const waiter = () => { - orders(6000, menu.hamburger, table[3]) + orders(randomTime(1000, 8000), menu.hamburger, table[3]) .then((res) => console.log(res)) .catch((err) => console.error(err)); }; +const waiter2 = () => { + orders(randomTime(1000, 8000), menu.hotdog, table[0]) + .then((res) => console.log(res)); + return orders(randomTime(1000, 8000), menu.pizza, table[2]) + .then((res) => console.log(res)) + .catch((err) => console.error(err)); +}; + + waiter(); +waiter2(); \ No newline at end of file From d73acf0d23c4c281d5a1d592ee03b9925c7e1fb1 Mon Sep 17 00:00:00 2001 From: LoreNa Date: Fri, 2 Oct 2020 20:02:07 -0500 Subject: [PATCH 3/3] Punto 3 Reto 2 JS --- PULL_REQUEST_TEMPLATE.md_ | 4 ++-- src/index.js | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md_ b/PULL_REQUEST_TEMPLATE.md_ index 8d49c83..ebf6fa2 100644 --- a/PULL_REQUEST_TEMPLATE.md_ +++ b/PULL_REQUEST_TEMPLATE.md_ @@ -12,6 +12,6 @@ Usuario Platzi: @LoreBratt ## Reto: - [ ] Primer problema - - [X] Segundo problema - - [ ] Tercer problema + - [ ] Segundo problema + - [X] Tercer problema - [ ] Cuarto Problema (Opcional) \ No newline at end of file diff --git a/src/index.js b/src/index.js index b3ce881..188b29a 100644 --- a/src/index.js +++ b/src/index.js @@ -40,6 +40,19 @@ const waiter2 = () => { .catch((err) => console.error(err)); }; +const waiter3 = async() => { + try{ + const order1 = await orders(randomTime(1000, 8000), menu.hotdog, table[1]) + console.log(order1) + const order2 = await orders(randomTime(1000, 8000), menu.pizza, table[1]) + console.log(order2) + const order3 = await orders(randomTime(1000, 8000), menu.hotdog, table[1]) + console.log(order3) + }catch(err){ + console.error(err) + } +}; waiter(); +waiter2(); waiter2(); \ No newline at end of file