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.

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

Feat/food request nham connection #777

Open
wants to merge 50 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
95957a6
Corrigindo nome da pasta foodInventory
Apr 2, 2024
35b1931
Adicionando o campo de edital nos formulários de agricultor
Apr 2, 2024
d0e2b30
Modificado o estilo do modal de gerar solicitação
Apr 4, 2024
8e79f58
corrigindo problemas no formulário de edital
Apr 8, 2024
0069d57
Fazendo a conexão entre o formulário de solicitações e o firebase no …
Apr 12, 2024
b51333e
Merge branch 'dev' into feat/food_request_nham_connection
Apr 12, 2024
ac99ca3
Fazendo o merge com a dev e modificando o changelog
Apr 12, 2024
caf29ca
Fixing issues
Apr 12, 2024
73c3236
modificada a view de gerar solicitação
Gusta-Santos May 7, 2024
c51b717
Criada a tela de gerar solicitação e permitindo que a solicitação sej…
May 16, 2024
dba64f6
Criando a tabela que exibe as solicitações na tela principal de solic…
May 17, 2024
1a689db
Estabelecendo a conexão com o firebase na funcionalidade de gerar sol…
May 22, 2024
407c9ff
criando conexão com o firebase para enviar a solicitação
May 24, 2024
c08522a
Finalizada funcionalidade do envio de solicitação para o firebase
May 28, 2024
70397f1
Alterando a forma como a solicitação era enviada para o firebase, adi…
May 29, 2024
e7b87e0
corrigindo a url da imagem da categoria que é enviada para o firebase
Jun 4, 2024
eaaf7b1
realizando o merge com a dev
Jun 4, 2024
8b33395
Criando a tela de ativar agricultores
Jun 6, 2024
394669d
Finalizada a funcionalidade de ativar e inativar agricultor
Jun 10, 2024
be1d06c
Corrigindo formatação da tela de edital e adicionando validações na t…
Jun 19, 2024
0e5ea63
Adicionando campos no firebase
Jun 21, 2024
414b3a3
Adicionando status na parte de edital e adicionando cálculo de unidad…
Jun 26, 2024
ecdab36
Realizando o merge com a dev
Jun 26, 2024
4b4c90e
Retirando o hide do input file
Jun 28, 2024
3bf737a
Adicionando os campos reference_id e file_name na tabela de edital
Jul 2, 2024
55e3e3b
Corrigindo a action de create no controller de notice para enviar o p…
Jul 4, 2024
65f776d
funcionando envio do arquivo pdf para o firebase
Jul 4, 2024
c187c63
Criado o botão de visualizar pdf no formulário de edital
Jul 5, 2024
f5e3427
Criando verificação ao acessar o url do pdf
Jul 10, 2024
158fe22
Realizando o merge com a dev
Jul 10, 2024
d4fc9b4
Corrigindo errors gerados pelo merge
Jul 12, 2024
5004977
Modificando o changelog
Jul 15, 2024
995f1b9
Corrigindo errors do sonarlint
Jul 15, 2024
c7ce0a0
corrigindo erros do sonarlint
Jul 15, 2024
927c7e2
Corrigindo code smells
Gusta-Santos Jul 16, 2024
7603aa8
Corrigindo inconsistências e criando migration unificada
Jul 19, 2024
1b48971
Corrigindo o erro na exibição da relação de alimentos de agricultor e…
Aug 2, 2024
4e24bb6
Corrigindo o erro na tabela de alimentos do agricultor, corrigindo a …
Aug 29, 2024
c0b241e
Finalizando o endpoint que atualiza o status da request
Sep 2, 2024
2143f09
Realizando merge com a dev e atualizando o changelog
Sep 2, 2024
67d723f
Corrigindo erros do sonarlint
Sep 2, 2024
f3a05e7
add missing semicolon to sql file
AnotherOne07 Sep 3, 2024
299b941
add missing semicolon to sql file
AnotherOne07 Sep 3, 2024
68406c9
Corrigindo o sql, o layout mobile e adicionando um loading na pagina …
Sep 5, 2024
bde674d
Merge branch 'feat/food_request_nham_connection' of https://github.co…
Sep 5, 2024
5d2d915
Merge branch 'dev' into feat/food_request_nham_connection
Gusta-Santos Sep 5, 2024
adcbc77
Modificando o instance
Sep 5, 2024
601265e
Merge branch 'feat/food_request_nham_connection' of https://github.co…
Sep 5, 2024
c7d2541
Corrigindo migrations
Sep 5, 2024
27ee9d1
Merge branch 'dev' into feat/food_request_nham_connection
Gusta-Santos Sep 10, 2024
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [Versão 3.87.187]
- Modificações nos cadastros de editais e agricultores.
- Permitindo o envio de PDF para o aplicativo do agricultor ao cadastrar ou alterar um edital.
- Modificações no processo de gerar uma solicitação, adicionadas as possibilidades de estabelecer a relação entre uma solicitação e várias escolas e vários agricultores.
- Adicionado um modal para exibir os detalhes de uma solicitação.
- Adicionada a tela de ativar e inativar tanto editais como agricultores.
- Adicionado o endpoint para modificar o status da solicitação

## [Versão 3.86.187]
- Inserido cor/raça na planilha de exportação de alunos

Expand Down
4 changes: 3 additions & 1 deletion app/migrations/2024-03-11_fix_food_request/default.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ALTER TABLE food_request ADD status ENUM('Em andamento','Finalizado') DEFAULT 'Em andamento'
ALTER TABLE food_request ADD status ENUM('Em andamento','Finalizado') DEFAULT 'Em andamento';

ALTER TABLE food_request DROP delivered;

Expand All @@ -9,3 +9,5 @@ ADD CONSTRAINT food_request_school_fk
FOREIGN KEY (school_fk) REFERENCES school_identification(inep_id)
ON DELETE NO ACTION
ON UPDATE CASCADE;

ALTER TABLE farmer_foods ADD deliveredAmount float DEFAULT 0;
19 changes: 19 additions & 0 deletions app/migrations/2024-04-02_add_notice_on_farmer_foods/default.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ALTER TABLE farmer_foods ADD foodNotice_fk int(11) NULL;

ALTER TABLE farmer_foods
ADD CONSTRAINT fk_farmer_foods_food_notice
FOREIGN KEY (foodNotice_fk) REFERENCES food_notice(id);

ALTER TABLE food_request add farmer_fk int(11) NOT NULL;

ALTER TABLE food_request
ADD CONSTRAINT fk_food_request_farmer
FOREIGN KEY (farmer_fk) REFERENCES farmer_register(id);

ALTER TABLE food_notice_item ADD foodNotice_fk int(11) NULL;

ALTER TABLE food_notice_item
ADD CONSTRAINT fk_food_notice_item_food_notice
FOREIGN KEY (foodNotice_fk) REFERENCES food_notice(id);

DROP TABLE food_notice_vs_food_notice_item;
64 changes: 64 additions & 0 deletions app/migrations/2024-05-13_refactor_food_request/default.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
ALTER TABLE food_request DROP FOREIGN KEY food_request_ibfk_1;
ALTER TABLE food_request DROP FOREIGN KEY food_request_school_fk;
ALTER TABLE food_request DROP FOREIGN KEY fk_food_request_farmer;

ALTER TABLE food_request DROP COLUMN food_fk;
ALTER TABLE food_request DROP COLUMN school_fk;
ALTER TABLE food_request DROP COLUMN farmer_fk;
ALTER TABLE food_request DROP COLUMN amount;
ALTER TABLE food_request DROP COLUMN measurementUnit;
ALTER TABLE food_request DROP COLUMN description;

ALTER TABLE food_request ADD COLUMN notice_fk int(11),
ADD CONSTRAINT fk_notice_fk
FOREIGN KEY (notice_fk) REFERENCES food_notice(id);

ALTER TABLE food_request ADD COLUMN reference_id varchar(36) NULL;

CREATE TABLE food_request_vs_farmer_register (
id INT(11) NOT NULL AUTO_INCREMENT,
farmer_fk INT(11),
food_request_fk INT(11),
PRIMARY KEY (id)
);

ALTER TABLE food_request_vs_farmer_register
ADD CONSTRAINT fk_farmer_fk
FOREIGN KEY (farmer_fk) REFERENCES farmer_register(id);

ALTER TABLE food_request_vs_farmer_register
ADD CONSTRAINT fk_food_request_fk
FOREIGN KEY (food_request_fk) REFERENCES food_request(id);

CREATE TABLE food_request_vs_school_identification (
id INT(11) NOT NULL AUTO_INCREMENT,
school_fk VARCHAR(8) NOT NULL COLLATE utf8_unicode_ci,
food_request_fk INT(11),
PRIMARY KEY (id)
);

ALTER TABLE food_request_vs_school_identification
ADD CONSTRAINT school_food_request_fk
FOREIGN KEY (food_request_fk) REFERENCES food_request(id);

ALTER TABLE food_request_vs_school_identification
ADD CONSTRAINT food_request_school_fk
FOREIGN KEY (school_fk) REFERENCES school_identification(inep_id)
ON DELETE NO ACTION
ON UPDATE CASCADE;

CREATE TABLE food_request_item (
id INT(11) NOT NULL AUTO_INCREMENT,
food_fk INT(11),
amount FLOAT,
measurementUnit ENUM('g','Kg','l','pacote','unidade') NULL,
food_request_fk INT(11),
PRIMARY KEY (id),
CONSTRAINT fk_food_fk
FOREIGN KEY (food_fk)
REFERENCES food(id)
);

ALTER TABLE food_request_item
ADD CONSTRAINT item_food_request_fk
FOREIGN KEY (food_request_fk) REFERENCES food_request(id);
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ALTER TABLE farmer_register ADD status enum('Inativo','Ativo') default 'Ativo' NULL;

ALTER TABLE food_notice ADD status enum('Inativo','Ativo') default 'Ativo' NULL;

ALTER TABLE food_notice ADD reference_id varchar(36) NULL;

ALTER TABLE food_notice ADD file_name varchar(100) NULL;
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
CREATE TABLE farmer_register (
id INT(11) NOT NULL AUTO_INCREMENT,
name varchar(100) NOT NULL,
cpf varchar(11) NOT NULL,
phone varchar(11) NULL,
group_type enum('Fornecedor Individual','Grupo Formal','Grupo Informal') NULL,
reference_id varchar(36) NULL,
status enum('Inativo', 'Ativo') DEFAULT 'Ativo',
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
PRIMARY KEY (id)
);

CREATE TABLE farmer_foods (
id INT(11) NOT NULL AUTO_INCREMENT,
food_fk int(11) NULL,
farmer_fk int(11) NULL,
measurementUnit enum('g','Kg','l','pacote','unidade') NULL,
amount FLOAT NOT NULL,
foodNotice_fk int(11) NULL,
deliveredAmount FLOAT NULL default 0,
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
CONSTRAINT fk_farmer_foods_food_notice FOREIGN KEY (foodNotice_fk) REFERENCES food_notice(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
CONSTRAINT fk_farmer_foods_food FOREIGN KEY (food_fk) REFERENCES food(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
CONSTRAINT fk_farmer_foods_farmer_register FOREIGN KEY (farmer_fk) REFERENCES farmer_register(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
PRIMARY KEY (id)
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
DROP TABLE IF EXISTS `food_notice_vs_food_notice_item`;
DROP TABLE IF EXISTS `food_notice_item`;
DROP TABLE IF EXISTS `food_notice`;
DROP TABLE IF EXISTS `farmer_foods`;
DROP TABLE IF EXISTS `farmer_register`;
DROP TABLE IF EXISTS `food_request_vs_school_identification`;
DROP TABLE IF EXISTS `food_request_vs_farmer_register`;
DROP TABLE IF EXISTS `food_request_item_received`;
DROP TABLE IF EXISTS `food_request_item`;
DROP TABLE IF EXISTS `food_request`;

CREATE TABLE food_notice (
id INT(11) NOT NULL AUTO_INCREMENT,
name varchar(255) NOT NULL,
date date NOT NULL,
status enum('Inativo', 'Ativo') DEFAULT 'Ativo',
reference_id varchar(36) NULL,
file_name varchar(100) NULL,
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
PRIMARY KEY (id)
);

CREATE TABLE food_notice_item (
id INT(11) NOT NULL AUTO_INCREMENT,
name varchar(255) NOT NULL,
description varchar(1000) NULL,
measurement varchar(20) NOT NULL,
year_amount varchar(20) NULL,
food_id int(11) NULL,
foodNotice_fk int(11) NULL,
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
CONSTRAINT fk_food_notice_item_food_notice FOREIGN KEY (foodNotice_fk) REFERENCES food_notice(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
CONSTRAINT fk_food_notice_item_food FOREIGN KEY (food_id) REFERENCES food(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
PRIMARY KEY (id)
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
CREATE TABLE food_request (
id INT(11) NOT NULL AUTO_INCREMENT,
date datetime NULL DEFAULT CURRENT_TIMESTAMP,
status enum('Em andamento','Finalizado') NULL default 'Em andamento',
notice_fk int(11) NULL,
reference_id varchar(36) NULL,
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
CONSTRAINT fk_food_request_food_notice FOREIGN KEY (notice_fk) REFERENCES food_notice(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
PRIMARY KEY (id)
);

CREATE TABLE food_request_item (
id INT(11) NOT NULL AUTO_INCREMENT,
food_fk int(11) NULL,
amount float NULL,
measurementUnit enum('g','Kg','l','pacote','unidade') NULL,
food_request_fk int(11) NULL,
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
CONSTRAINT fk_food_request_item_food FOREIGN KEY (food_fk) REFERENCES food(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
CONSTRAINT fk_food_request_item_food_request FOREIGN KEY (food_request_fk) REFERENCES food_request(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
PRIMARY KEY (id)
);

CREATE TABLE food_request_item_received (
id INT(11) NOT NULL AUTO_INCREMENT,
food_fk int(11) NULL,
farmer_fk int(11) NULL,
food_request_fk int(11) NULL,
amount float NULL,
measurementUnit enum('g','Kg','l','pacote','unidade') NULL,
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
date datetime NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT fk_food_request_item_received_food_fk FOREIGN KEY (food_fk) REFERENCES food(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
CONSTRAINT fk_food_request_item_received_farmer_fk FOREIGN KEY (farmer_fk) REFERENCES farmer_register(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
CONSTRAINT fk_food_request_item_received_food_requestfk FOREIGN KEY (food_request_fk) REFERENCES food_request(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
PRIMARY KEY (id)
);

CREATE TABLE food_request_vs_farmer_register (
id INT(11) NOT NULL AUTO_INCREMENT,
farmer_fk int(11) NULL,
food_request_fk int(11) NULL,
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
CONSTRAINT fk_farmer_fk FOREIGN KEY (farmer_fk) REFERENCES farmer_register(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
CONSTRAINT fk_food_request_fk FOREIGN KEY (food_request_fk) REFERENCES food_request(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
PRIMARY KEY (id)
);

CREATE TABLE food_request_vs_school_identification (
id INT(11) NOT NULL AUTO_INCREMENT,
school_fk VARCHAR(8) NOT NULL COLLATE utf8_unicode_ci,
food_request_fk int(11) NULL,
created_at DATETIME DEFAULT NULL,
updated_at DATETIME DEFAULT NULL,
CONSTRAINT food_request_school_fk FOREIGN KEY (school_fk) REFERENCES school_identification(inep_id)
ON DELETE NO ACTION ON UPDATE CASCADE,
CONSTRAINT school_food_request_fk FOREIGN KEY (food_request_fk) REFERENCES food_request(id)
ON UPDATE RESTRICT ON DELETE RESTRICT,
PRIMARY KEY (id)
);
Loading
Loading