Skip to content

Commit

Permalink
Merge pull request #42 from dianaRodriguess/refatorar
Browse files Browse the repository at this point in the history
Reestruturação do do projeto. Closes #41.
  • Loading branch information
dianaRodriguess authored Oct 29, 2024
2 parents a1dc193 + 16a84a9 commit 807bc45
Show file tree
Hide file tree
Showing 31 changed files with 562 additions and 364 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ CC := gcc
CFLAGS := -Wall -Wextra -pedantic

# Source files
SRCS := main.c view/interface.c model/cliente.c model/equipamentos.c model/funcionario.c model/treino.c controller/entradas.c controller/loops.c controller/menu.c
SRCS := main.c $(wildcard view/*.c) $(wildcard model/*.c) $(wildcard controller/*.c) $(wildcard clientes/*.c) $(wildcard equipamentos/*.c) $(wildcard treinos/*.c) $(wildcard funcionarios/*.c)

# Object files
OBJS := $(SRCS:.c=.o)

# Header files
HDRS := view/interface.h model/cliente.h model/equipamentos.h model/funcionario.h model/treino.h controller/entradas.h controller/loops.h controller/menu.h
HDRS := $(wildcard view/*.h) $(wildcard model/*.h) $(wildcard controller/*.h) $(wildcard clientes/*.h) $(wildcard equipamentos/*.h) $(wildcard treinos/*.h) $(wildcard funcionarios/*.h)

# Executable name
TARGET := main
Expand Down
51 changes: 51 additions & 0 deletions clientes/controller.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "view.h"
#include "../view/entradas.h"


void cadastrarCliente(void) {
char nome[55], cpf[15], endereco[55], telefone[15], email[55], dataNasc[11];
char sexo, plano;

menuCadastrarCliente();
capturarNome(nome);
capturarCPF(cpf);
capturarEndereco(endereco);
capturarTelefone(telefone);
capturarEmail(email);
capturarDataNasc(dataNasc);
capturarSexo(&sexo);
capturarPlano(&plano);

printf("|_____________________________________________|\n");

}

void pesquisarCliente(void) {
char cpf[15];

menuPesquisarCliente();
capturarCPF(cpf);

printf("|_____________________________________________|\n");
}

void atualizarCliente(void) {
char cpf[15];

menuAtualizarCliente();
capturarCPF(cpf);

printf("|_____________________________________________|\n");
}

void deletarCliente(void) {
char cpf[15];

menuDeletarCliente();
capturarCPF(cpf);

printf("|_____________________________________________|\n");
}
7 changes: 4 additions & 3 deletions model/cliente.h → clientes/controller.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#if !defined(_CLIENTE_H)
#define _CLIENTE_H
#ifndef CONTROLER_H
#define CONTROLER_H

void cadastrarCliente(void);
void pesquisarCliente(void);
void atualizarCliente(void);
void deletarCliente(void);

#endif // _CLIENTE_H

#endif
Empty file added clientes/model.c
Empty file.
32 changes: 32 additions & 0 deletions clientes/view.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include <stdio.h>
#include <stdlib.h>
#include "view.h"


void menuCadastrarCliente(void){
system("clear");
printf("|_____________________________________________|\n");
printf("|..... . ... CADASTRAR CLIENTE ... . .....|\n");
printf("|_____________________________________________|\n");
}

void menuPesquisarCliente(void){
system("clear");
printf("|_____________________________________________|\n");
printf("|..... . ... PESQUISAR CLIENTE ... . .....|\n");
printf("|_____________________________________________|\n");
}

void menuAtualizarCliente(void){
system("clear");
printf("|_____________________________________________|\n");
printf("|..... . ... ATUALIZAR CLIENTE ... . .....|\n");
printf("|_____________________________________________|\n");
}

void menuDeletarCliente(void){
system("clear");
printf("|_____________________________________________|\n");
printf("|...... . ... DELETAR CLIENTE ... . ......|\n");
printf("|_____________________________________________|\n");
}
10 changes: 10 additions & 0 deletions clientes/view.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#ifndef VIEW_H
#define VIEW_H

void menuCadastrarCliente(void);
void menuPesquisarCliente(void);
void menuAtualizarCliente(void);
void menuDeletarCliente(void);


#endif // VIEW_H
33 changes: 0 additions & 33 deletions controller/entradas.c

This file was deleted.

9 changes: 0 additions & 9 deletions controller/entradas.h

This file was deleted.

10 changes: 5 additions & 5 deletions controller/loops.c
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <stdio.h>
#include "entradas.h"
#include "loops.h"
#include "../model/cliente.h"
#include "../model/equipamentos.h"
#include "../model/funcionario.h"
#include "../model/treino.h"
#include "../view/entradas.h"
#include "../clientes/controller.h"
#include "../equipamentos/controller.h"
#include "../funcionarios/controller.h"
#include "../treinos/controller.h"
#include "../view/interface.h"


Expand Down
10 changes: 5 additions & 5 deletions controller/menu.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include <stdio.h>
#include <stdlib.h>
#include "../view/interface.h"
#include "../model/cliente.h"
#include "../model/equipamentos.h"
#include "../model/funcionario.h"
#include "../model/treino.h"
#include "entradas.h"
#include "../clientes/controller.h"
#include "../equipamentos/controller.h"
#include "../funcionarios/controller.h"
#include "../treinos/controller.h"
#include "../view/entradas.h"
#include "loops.h"

void menu(void){
Expand Down
50 changes: 50 additions & 0 deletions equipamentos/controller.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#include <stdio.h>
#include <stdlib.h>
#include "view.h"
#include "../view/entradas.h"

void cadastrarEquipamento(void){
char nome[55], funcao[27], marca[27], preco[9];
char quantidade[9], codBarras[13];

menuCadastrarEquipamento();

capturarNome(nome);
capturarFuncao(funcao);
capturarMarca(marca);
capturarPreco(preco);
capturarQuantidade(quantidade);
capturarCodBarras(codBarras);

printf("|________________________________________________|\n");
}

void pesquisarEquipamento(void){
char codBarras[13];

menuPesquisarEquipamento();

capturarCodBarras(codBarras);

printf("|________________________________________________|\n");
}

void atualizarEquipamento(void){
char codBarras[13];

menuAtualizarEquipamento();

capturarCodBarras(codBarras);

printf("|________________________________________________|\n");
}

void deletarEquipamento(void){
char codBarras[13];

menuDeletarEquipamento();

capturarCodBarras(codBarras);

printf("|________________________________________________|\n");
}
6 changes: 3 additions & 3 deletions model/equipamentos.h → equipamentos/controller.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#if !defined(_EQUIPAMENTOS_H)
#define _EQUIPAMENTOS_H
#ifndef CONTROLLER_H
#define CONTROLLER_H

void cadastrarEquipamento(void);
void pesquisarEquipamento(void);
void atualizarEquipamento(void);
void deletarEquipamento(void);

#endif // _EQUIPAMENTOS_H
#endif // CONTROLLER_H
Empty file added equipamentos/model.c
Empty file.
31 changes: 31 additions & 0 deletions equipamentos/view.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#include <stdio.h>
#include <stdlib.h>


void menuCadastrarEquipamento(void){
system("clear");
printf("|_________________________________________________|\n");
printf("|..... . ... CADASTRAR EQUIPAMENTO ... . .....|\n");
printf(" _________________________________________________|\n");
}

void menuPesquisarEquipamento(void){
system("clear");
printf("|_______________________________________________________________|\n");
printf("|..... . ... . .... PESQUISAR EQUIPAMENTO .... . ... . .....|\n");
printf(" _______________________________________________________________|\n");
}

void menuAtualizarEquipamento(void){
system("clear");
printf("|_______________________________________________________________|\n");
printf("|..... . ... . .... ATUALIZAR EQUIPAMENTO .... . ... . .....|\n");
printf("|_______________________________________________________________|\n");
}

void menuDeletarEquipamento(void){
system("clear");
printf("|_____________________________________________________________|\n");
printf("|..... . ... . .... DELETAR EQUIPAMENTO .... . ... . .....|\n");
printf("|_____________________________________________________________|\n");
}
9 changes: 9 additions & 0 deletions equipamentos/view.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#ifndef VIEW_H
#define VIEW_H

void menuCadastrarEquipamento(void);
void menuPesquisarEquipamento(void);
void menuAtualizarEquipamento(void);
void menuDeletarEquipamento(void);

#endif
49 changes: 49 additions & 0 deletions funcionarios/controller.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "view.h"
#include "../view/entradas.h"


void cadastrarFuncionario(void) {
char nome [55], cpf [15], endereco [55], telefone [15], email [55], dataNasc [11];
char cargo [22];

menuCadastrarFuncionario();
capturarNome(nome);
capturarCPF(cpf);
capturarEndereco(endereco);
capturarTelefone(telefone);
capturarEmail(email);
capturarDataNasc(dataNasc);
capturarCargo(cargo);

printf("|_____________________________________________|\n");
}

void pesquisarFuncionario(void) {
char cpf[15];

menuPesquisarFuncionario();
capturarCPF(cpf);

printf("|_____________________________________________|\n");
}

void atualizarFuncionario(void) {
char cpf[15];

menuAtualizarFuncionario();
capturarCPF(cpf);

printf("|_____________________________________________|\n");
}

void deletarFuncionario(void) {
char cpf[15];

menuDeletarFuncionario();
capturarCPF(cpf);

printf("|_____________________________________________|\n");
}
7 changes: 4 additions & 3 deletions model/funcionario.h → funcionarios/controller.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#if !defined(_FUNCIONARIO_H_)
#define _FUNCIONARIO_H_
#ifndef FUN_CONTROLLER_H
#define FUN_CONTROLLER_H

void cadastrarFuncionario(void);
void pesquisarFuncionario(void);
void atualizarFuncionario(void);
void deletarFuncionario(void);

#endif // __FUNCIONARIO_H_f

#endif // FUN_CONTROLLER_H
Empty file added funcionarios/model.c
Empty file.
Loading

0 comments on commit 807bc45

Please sign in to comment.