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

controlMozo() podía limpiar :), eliminado menuLimpieza() #17

Merged
merged 1 commit into from
Jun 21, 2023
Merged

controlMozo() podía limpiar :), eliminado menuLimpieza() #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bin/Debug/tmphotel.exe
View file
Open in desktop
Binary file not shown.
27 changes: 13 additions & 14 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,26 @@ void mostrarSeparador();
void controlMozo();
void controlReservas();
void controlAdmin();
void controlInicio();

int main()
{
int continuar = 1;
controlInicio();
return 0;
}

void controlInicio()
{
char continuar = 1;

while (continuar)
{
inicioSesion();
printf("¿Desea volver al inicio de sesion? (1: Sí / 0: No): ");
printf("Que desea hacer? 1: Ir a inicio de sesion / 0: Cerrar programa): ");
scanf("%d", &continuar);
limpiarPantalla();
}

return 0;
}

void inicioSesion()
Expand Down Expand Up @@ -71,19 +77,12 @@ void inicioSesion()

for (int j = 0; j < strlen(titulo[i]); j++)
{
<<<<<<< HEAD
// Calcula el valor de azul y violeta en funcion de la posicion j
int azul = 255 - j * (255 / strlen(titulo[i]));
int violeta = j * (255 / strlen(titulo[i]));

// Establece el color utilizando codigos de escape ANSI
=======
// Calcula el valor de azul y violeta en función de la posición j
int azul = 255 - j * (255 / strlen(titulo[i]));
int violeta = j * (255 / strlen(titulo[i]));

// Establece el color utilizando códigos de escape ANSI
>>>>>>> 0d5249ac126c105145a55d02a824d5edd1ac057f
printf("\033[48;2;%d;0;%dm%c\033[0m", violeta, azul, titulo[i][j]);
}

Expand Down Expand Up @@ -152,8 +151,8 @@ void controlMozo()
printf("=====================================\n");
printf("| Opcion | Descripcion |\n");
printf("=====================================\n");
printf("| 1 | Menu de Limpieza |\n");
printf("| 2 | Menu de Comida |\n");
printf("| 1 | Menu de Comida |\n");
printf("| 2 | Menu de Botellas |\n");
printf("| 0 | Salir |\n");
printf("=====================================\n");

Expand All @@ -165,10 +164,10 @@ void controlMozo()
switch (decision)
{
case 1:
menuLimpieza();
menuComidas();
break;
case 2:
menuComidas();
menuBotellas();
break;
case 0:
return;
Expand Down
Binary file modified obj/Debug/main.o
View file
Open in desktop
Binary file not shown.
23 changes: 17 additions & 6 deletions tmphotel.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
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"

1687297936 D
1687320192 D
"comidas.h"
"empleados.h"
<time.h>
Expand Down Expand Up @@ -636,11 +636,22 @@
<string.h>
"tiempo.h"

<<<<<<< HEAD
1687326147 source:c:\storage\docs\learning-aprendizaje\aa tecnología\docs\utn\tup\cursada\primer cuatrimestre\prog-laboratorio\trabajo final\gestion-hotel\main.c
=======
1687324821 source:c:\storage\docs\learning-aprendizaje\aa tecnología\docs\utn\tup\cursada\primer cuatrimestre\prog-laboratorio\trabajo final\gestion-hotel\main.c
>>>>>>> 0d5249ac126c105145a55d02a824d5edd1ac057f
1687326489 source:c:\storage\docs\learning-aprendizaje\aa tecnología\docs\utn\tup\cursada\primer cuatrimestre\prog-laboratorio\trabajo final\gestion-hotel\main.c
<stdio.h>
<stdlib.h>
"tiempo.h"
"reservas.h"
"const.h"
<time.h>
<unistd.h>
"linkdepago.h"
"botellas.h"
"comidas.h"
"empleados.h"
"porLimpiar.h"
"preguntarDNI.h"

1687324821 249ac126c105145a55d02a824d5edd1ac057f
<stdio.h>
<stdlib.h>
"tiempo.h"
Expand Down
52 changes: 26 additions & 26 deletions tmphotel.layout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,74 +7,74 @@
<Cursor1 position="27" topLine="0" />
</Cursor>
</File>
<File name="comidas.c" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1953" topLine="27" />
</Cursor>
</File>
<File name="linkdepago.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="tiempo.c" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="4" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="habitaciones.c" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="main.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="6" zoom_2="0">
<Cursor>
<Cursor1 position="1773" topLine="18" />
<Cursor1 position="648" topLine="21" />
</Cursor>
</File>
<File name="reservas.c" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="4" zoom_2="0">
<File name="tiempo.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="3" zoom_2="0">
<Cursor>
<Cursor1 position="1696" topLine="22" />
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="main.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
<File name="comidas.c" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5605" topLine="199" />
<Cursor1 position="1953" topLine="27" />
</Cursor>
</File>
<File name="tiempo.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="3" zoom_2="0">
<File name="empleados.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
<Cursor1 position="79" topLine="0" />
</Cursor>
</File>
<File name="empleados.c" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="5" zoom_2="0">
<File name="preguntarDNI.c" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="616" topLine="24" />
<Cursor1 position="303" topLine="0" />
</Cursor>
</File>
<File name="botellas.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="botellas.c" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="285" topLine="0" />
<Cursor1 position="110" topLine="0" />
</Cursor>
</File>
<File name="reservas.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
<Cursor>
<Cursor1 position="607" topLine="0" />
</Cursor>
</File>
<File name="botellas.c" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="reservas.c" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="4" zoom_2="0">
<Cursor>
<Cursor1 position="110" topLine="0" />
<Cursor1 position="1696" topLine="22" />
</Cursor>
</File>
<File name="empleados.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
<File name="linkdepago.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="79" topLine="0" />
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="preguntarDNI.c" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="empleados.c" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="5" zoom_2="0">
<Cursor>
<Cursor1 position="303" topLine="0" />
<Cursor1 position="616" topLine="24" />
</Cursor>
</File>
<File name="botellas.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="285" topLine="0" />
</Cursor>
</File>
<File name="linkdepago.c" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="5" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="tiempo.c" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="4" zoom_2="0">
<File name="habitaciones.c" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
<Cursor1 position="1773" topLine="18" />
</Cursor>
</File>
</CodeBlocks_layout_file>