Skip to content

Commit

Permalink
Merge pull request #14 from soypato/desarrolloJuanma
Browse files Browse the repository at this point in the history 
Desarrollo juanma
  • Loading branch information
@soypato
soypato committed Jun 21, 2023
2 parents 864ac1e + 17f90e0 commit 600562a
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 208 deletions.
Binary file modified bin/Debug/tmphotel.exe
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions comidas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int menuComidas()
break;

case 0:
printf("Opción inválida. Por favor, ingrese nuevamente.\n");
inicioSesion();
break;

}
Expand All @@ -68,15 +68,15 @@ int CargarAlimentos(Alimento Alimentos[][MATRIZ_S], int dimF)
{
printf("Ingrese la comida: ");
fflush(stdin);
gets(Alimentos.comida[]);
//gets(Alimentos.comida[]);

printf("Ingrese el postre: ");
fflush(stdin);
gets(Alimentos.postre[f]);
//gets(Alimentos.postre[f]);

printf("Ingrese la fruta: ");
fflush(stdin);
gets(Alimentos.fruta[f]);
//gets(Alimentos.fruta[f]);

printf("Deseas seguir cargando alimentos (s/n)? ");
fflush(stdin);
Expand Down
10 changes: 4 additions & 6 deletions main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@
#include <unistd.h> // Libreria para usleep (retraso en microsegundos)
#include "linkdepago.h"
#include "botellas.h"
<<<<<<< HEAD
#include "comidas.h"
=======

#include "empleados.h"
<<<<<<< HEAD

#include "porLimpiar.h"
=======

#include "preguntarDNI.h"
>>>>>>> 58d32f6160dc9bdee81f4bf67edee4af5402a548
>>>>>>> 970716e684cb5c50e4ac4eefaf7f02c2d71f30ec


void inicioSesion();
void limpiarPantalla();
Expand Down
Binary file modified obj/Debug/comidas.o
View file
Binary file not shown.
Binary file modified obj/Debug/main.o
View file
Binary file not shown.
10 changes: 8 additions & 2 deletions tmphotel.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@
</Unit>
<Unit filename="comidas.h" />
<Unit filename="const.h" />

<Unit filename="empleados.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="empleados.h" />

<Unit filename="habitaciones.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="habitaciones.h" />
<Unit filename="linkdepago.c">
<Option compilerVar="CC" />
</Unit>
Expand All @@ -57,6 +59,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="pila.h" />
<Unit filename="porLimpiar.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="porLimpiar.h" />
<Unit filename="preguntarDNI.c">
<Option compilerVar="CC" />
</Unit>
Expand Down
78 changes: 49 additions & 29 deletions tmphotel.depend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,35 +288,53 @@
1679999162 source:c:\storage\docs\learning-aprendizaje\aa tecnología\docs\utn\tup\cursada\primer cuatrimestre\prog-laboratorio\trabajo final\reservas-segunda-ver\pila.c
"pila.h"

<<<<<<< HEAD
1687297936 D
"comidas.h"
"empleados.h"
<time.h>
<unistd.h>

1687231550 source:c:\users\usuario\desktop\utn tarea\prog 1 y lab 1\tp_final aportacionnacho\repodepatotb\reserva-hotel\linkdepago.c
=======
1687244091 source:c:\users\juanm\gestion-hotel\botellas.c

1687306670 source:c:\users\juanm\gestion-hotel\botellas.c
<stdio.h>
<stdlib.h>
<string.h>
"botellas.h"

1687244091 c:\users\juanm\gestion-hotel\botellas.h
1687306670 c:\users\juanm\gestion-hotel\botellas.h
"pila.h"

1687244091 c:\users\juanm\gestion-hotel\pila.h
<stdio.h>
<malloc.h>

1687244091 source:c:\users\juanm\gestion-hotel\linkdepago.c
>>>>>>> 970716e684cb5c50e4ac4eefaf7f02c2d71f30ec

1687297936 716e684cb5c50e4ac4eefaf7f02c2d71f30ec
<stdio.h>
<stdlib.h>
<string.h>
<time.h>
"const.h"
<stdio.h>
<stdlib.h>
"tiempo.h"
"reservas.h"
"const.h"
<time.h>
<unistd.h>
"linkdepago.h"
"botellas.h"
<stdio.h>
<stdlib.h>
<string.h>
"botellas.h"

<<<<<<< HEAD
1687231550 c:\users\usuario\desktop\utn tarea\prog 1 y lab 1\tp_final aportacionnacho\repodepatotb\reserva-hotel\const.h

1687301535 source:c:\users\usuario\desktop\utn tarea\prog 1 y lab 1\tp_final aportacionnacho\repodepatotb\reserva-hotel\main.c
=======

1687244091 c:\users\juanm\gestion-hotel\const.h

1687244091 source:c:\users\juanm\gestion-hotel\pila.c
Expand Down Expand Up @@ -359,8 +377,7 @@
1687305782 c:\users\juanm\gestion-hotel\empleados.h
"tiempo.h"

1687245650 source:c:\users\juanm\gestion-hotel\main.c
>>>>>>> 970716e684cb5c50e4ac4eefaf7f02c2d71f30ec
1687307050 source:c:\users\juanm\gestion-hotel\main.c
<stdio.h>
<stdlib.h>
"tiempo.h"
Expand All @@ -370,8 +387,10 @@
<unistd.h>
"linkdepago.h"
"botellas.h"
<<<<<<< HEAD
"comidas.h"
"empleados.h"
"porLimpiar.h"
"preguntarDNI.h"

1687231550 c:\users\usuario\desktop\utn tarea\prog 1 y lab 1\tp_final aportacionnacho\repodepatotb\reserva-hotel\tiempo.h
<stdio.h>
Expand Down Expand Up @@ -407,38 +426,30 @@
"tiempo.h"

1687244132 source:c:\users\usuario\desktop\utn tarea\prog 1 y lab 1\tp_final aportacionnacho\repodepatotb\reserva-hotel\botellas.c
=======
"empleados.h"
"preguntarDNI.h"

1687244091 c:\users\juanm\gestion-hotel\linkdepago.h

<<<<<<< HEAD
1687287911 c:\storage\docs\learning-aprendizaje\aa tecnología\docs\utn\tup\cursada\primer cuatrimestre\prog-laboratorio\trabajo final\reservas-segunda-ver\empleados.h

1687287911 source:c:\storage\docs\learning-aprendizaje\aa tecnología\docs\utn\tup\cursada\primer cuatrimestre\prog-laboratorio\trabajo final\reservas-segunda-ver\empleados.c
=======

1687245650 c:\users\juanm\gestion-hotel\preguntardni.h

1687246555 source:c:\users\juanm\gestion-hotel\preguntardni.c
<stdlib.h>
<stdio.h>

1687297936 source:d:\codeblock\codigos\reserva-hotel\botellas.c
>>>>>>> 970716e684cb5c50e4ac4eefaf7f02c2d71f30ec
<stdio.h>
<stdlib.h>
<string.h>
"botellas.h"

<<<<<<< HEAD
1687300783 source:c:\users\usuario\desktop\utn tarea\prog 1 y lab 1\tp_final aportacionnacho\repodepatotb\reserva-hotel\comidas.c
<stdio.h>
<stdlib.h>
"comidas.h"

1687302510 c:\users\usuario\desktop\utn tarea\prog 1 y lab 1\tp_final aportacionnacho\repodepatotb\reserva-hotel\comidas.h
=======

1687297936 d:\codeblock\codigos\reserva-hotel\botellas.h
"pila.h"

Expand Down Expand Up @@ -484,15 +495,12 @@
"pila.h"

1687297936 source:d:\codeblock\codigos\reserva-hotel\reservas.c
>>>>>>> 58d32f6160dc9bdee81f4bf67edee4af5402a548

1687297936 32f6160dc9bdee81f4bf67edee4af5402a548
<stdio.h>
<stdlib.h>
<string.h>
"tiempo.h"
<<<<<<< HEAD
"empleados.h"
<time.h>
<unistd.h>

1687304454 source:c:\storage\docs\learning-aprendizaje\aa tecnología\docs\utn\tup\cursada\primer cuatrimestre\prog-laboratorio\trabajo final\reservas-segunda-ver\porlimpiar.c
<stdlib.h>
Expand All @@ -501,7 +509,6 @@
"porLimpiar.h"

1687304526 c:\storage\docs\learning-aprendizaje\aa tecnología\docs\utn\tup\cursada\primer cuatrimestre\prog-laboratorio\trabajo final\reservas-segunda-ver\porlimpiar.h
=======
"reservas.h"
"preguntarDNI.h"
<stdio.h>
Expand All @@ -512,15 +519,28 @@
<stdlib.h>
<string.h>
"tiempo.h"
>>>>>>> 58d32f6160dc9bdee81f4bf67edee4af5402a548
>>>>>>> 970716e684cb5c50e4ac4eefaf7f02c2d71f30ec

1687305964 c:\users\juanm\gestion-hotel\habitaciones.h

1687306288 source:c:\users\juanm\gestion-hotel\habitaciones.c
1687306319 source:c:\users\juanm\gestion-hotel\habitaciones.c
<stdio.h>
<stdlib.h>
<string.h>
"habitaciones.h"
"empleados.h"

1687306670 c:\users\juanm\gestion-hotel\comidas.h

1687306670 c:\users\juanm\gestion-hotel\porlimpiar.h

1687309225 source:c:\users\juanm\gestion-hotel\comidas.c
<stdio.h>
<stdlib.h>
"comidas.h"

1687306670 source:c:\users\juanm\gestion-hotel\porlimpiar.c
<stdlib.h>
<stdio.h>
"pila.h"
"porLimpiar.h"

Loading

0 comments on commit 600562a

Please sign in to comment.