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

Desarrollo pato #16

Merged
merged 3 commits into from
Jun 21, 2023
Merged

Desarrollo pato #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16f07d3
mejora marquesina ascii art en main.c :)
soypato Jun 21, 2023
26b2873
eliminadas tildes
soypato Jun 21, 2023
eae2e3f
eliminadas tildes
soypato Jun 21, 2023
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.
53 changes: 30 additions & 23 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ int main()
while (continuar)
{
inicioSesion();
printf("¿Desea volver al inicio de sesión? (1: Sí / 0: No): ");
printf("¿Desea volver al inicio de sesion? (1: Sí / 0: No): ");
scanf("%d", &continuar);
limpiarPantalla();
}
Expand Down Expand Up @@ -71,11 +71,19 @@ 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 @@ -140,17 +148,17 @@ void controlMozo()
do
{
printf("=====================================\n");
printf("| Menú Mozo |\n");
printf("| Menu Mozo |\n");
printf("=====================================\n");
printf("| Opción | Descripción |\n");
printf("| Opcion | Descripcion |\n");
printf("=====================================\n");
printf("| 1 | Menú de Limpieza |\n");
printf("| 2 | Menú de Comida |\n");
printf("| 1 | Menu de Limpieza |\n");
printf("| 2 | Menu de Comida |\n");
printf("| 0 | Salir |\n");
printf("=====================================\n");


printf("Su decisión: ");
printf("Su decision: ");
fflush(stdin);
scanf(" %d", &decision);

Expand All @@ -165,7 +173,7 @@ void controlMozo()
case 0:
return;
default:
printf("La opción es incorrecta.\n");
printf("La opcion es incorrecta.\n");
break;
}

Expand All @@ -184,15 +192,15 @@ void controlRecepcionista()
printf("=====================================\n");
printf("| Control recepcionista |\n");
printf("=====================================\n");
printf("| Opción | Descripción |\n");
printf("| Opcion | Descripcion |\n");
printf("=====================================\n");
printf("| 1 | Menú de Habitaciones |\n");
printf("| 2 | Menú de Reserva |\n");
printf("| 1 | Menu de Habitaciones |\n");
printf("| 2 | Menu de Reserva |\n");
printf("| 3 | Generar pagos |\n");
printf("| 0 | Salir |\n");
printf("=====================================\n");

printf("Su decisión: ");
printf("Su decision: ");
fflush(stdin);
scanf(" %d", &decision);

Expand All @@ -210,7 +218,6 @@ void controlRecepcionista()
case 0:
return;
}

printf("Seguir ejecutando? (1: Sí / 0: No): ");
scanf("%d", &decision);
}
Expand All @@ -223,17 +230,17 @@ void controlLimpieza()
do
{
printf("=====================================\n");
printf("| Menú Limpieza |\n");
printf("| Menu Limpieza |\n");
printf("=====================================\n");
printf("| Opción | Descripción |\n");
printf("| Opcion | Descripcion |\n");
printf("=====================================\n");
printf("| 1 | Menu Limpieza |\n");
printf("| 2 | Menu Botellas |\n");
printf("| 3 | Menu Habitaciones |\n");
printf("| 0 | Salir |\n");
printf("=====================================\n");

printf("Su decisión: ");
printf("Su decision: ");
fflush(stdin);
scanf(" %d", &decision);

Expand Down Expand Up @@ -264,20 +271,20 @@ void controlAdmin()
do
{
printf("=====================================\n");
printf("| Menú Administrador |\n");
printf("| Menu Administrador |\n");
printf("=====================================\n");
printf("| Opción | Descripción |\n");
printf("| Opcion | Descripcion |\n");
printf("=====================================\n");
printf("| 1 | Menú de Botellas |\n");
printf("| 2 | Menú de Comidas |\n");
printf("| 2 | Menú de Empleados |\n");
printf("| 2 | Menú de Limpieza |\n");
printf("| 2 | Menú de Reserva |\n");
printf("| 1 | Menu de Botellas |\n");
printf("| 2 | Menu de Comidas |\n");
printf("| 2 | Menu de Empleados |\n");
printf("| 2 | Menu de Limpieza |\n");
printf("| 2 | Menu de Reserva |\n");
printf("| 2 | Generar pagos |\n");
printf("| 0 | Salir |\n");
printf("=====================================\n");

printf("Su decisión: ");
printf("Su decision: ");
fflush(stdin);
scanf(" %d", &decision);

Expand Down
Binary file modified obj/Debug/main.o
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions tmphotel.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,11 @@
<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
<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 @@ -2,77 +2,77 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" />
<File name="botellas.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="const.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="11" zoom_2="0">
<Cursor>
<Cursor1 position="285" topLine="0" />
<Cursor1 position="27" topLine="0" />
</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="comidas.c" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
<Cursor1 position="1953" topLine="27" />
</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="linkdepago.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="110" 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="habitaciones.c" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="303" topLine="0" />
<Cursor1 position="1773" topLine="18" />
</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="reservas.c" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="4" zoom_2="0">
<Cursor>
<Cursor1 position="79" topLine="0" />
<Cursor1 position="1696" topLine="22" />
</Cursor>
</File>
<File name="comidas.c" open="1" top="0" tabpos="13" 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="2" zoom_2="0">
<Cursor>
<Cursor1 position="1953" topLine="27" />
<Cursor1 position="5605" topLine="199" />
</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="tiempo.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="3" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="const.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="11" 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="27" topLine="0" />
<Cursor1 position="616" topLine="24" />
</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="botellas.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
<Cursor1 position="285" 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="main.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="3" 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="2801" topLine="0" />
<Cursor1 position="110" topLine="0" />
</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="empleados.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
<Cursor>
<Cursor1 position="1696" topLine="22" />
<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="habitaciones.c" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<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="1773" topLine="0" />
<Cursor1 position="0" 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">
<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>
Expand Down