diff --git a/build/classes/classes/Cliente.class b/build/classes/classes/Cliente.class
index 8af4a9f..376fd41 100644
Binary files a/build/classes/classes/Cliente.class and b/build/classes/classes/Cliente.class differ
diff --git a/build/classes/classes/Funcionario.class b/build/classes/classes/Funcionario.class
index 8ae03ed..80944dc 100644
Binary files a/build/classes/classes/Funcionario.class and b/build/classes/classes/Funcionario.class differ
diff --git a/build/classes/telas/Menu.form b/build/classes/telas/Menu.form
index b2c096d..5c0bd22 100644
--- a/build/classes/telas/Menu.form
+++ b/build/classes/telas/Menu.form
@@ -47,7 +47,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -61,7 +65,7 @@
-
+
@@ -70,7 +74,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -99,13 +107,18 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -118,13 +131,18 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -137,13 +155,18 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -156,13 +179,18 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -175,32 +203,42 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
-
+
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -281,12 +319,20 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
diff --git a/build/classes/telas/areaCliente.form b/build/classes/telas/areaCliente.form
index 9eeb4a5..32ea4b1 100644
--- a/build/classes/telas/areaCliente.form
+++ b/build/classes/telas/areaCliente.form
@@ -19,8 +19,10 @@
+
+<<<<<<< Updated upstream
@@ -57,118 +59,133 @@
+=======
+
+
+>>>>>>> Stashed changes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -184,31 +201,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -229,6 +264,9 @@
+
+
+
@@ -282,6 +320,9 @@
+
+
+
@@ -309,8 +350,17 @@
+
+
+
+
+
+
+
+
+<<<<<<< Updated upstream
@@ -324,14 +374,19 @@
+=======
+
+>>>>>>> Stashed changes
-
-
+
+
-
-
-
+
+
+
+
+
diff --git a/build/classes/telas/areaFuncionario$1.class b/build/classes/telas/areaFuncionario$1.class
index 388717d..8cc1a7a 100644
Binary files a/build/classes/telas/areaFuncionario$1.class and b/build/classes/telas/areaFuncionario$1.class differ
diff --git a/build/classes/telas/areaFuncionario$2.class b/build/classes/telas/areaFuncionario$2.class
index 43638e9..8ca9f37 100644
Binary files a/build/classes/telas/areaFuncionario$2.class and b/build/classes/telas/areaFuncionario$2.class differ
diff --git a/build/classes/telas/areaFuncionario$3.class b/build/classes/telas/areaFuncionario$3.class
index bea8803..47da0a2 100644
Binary files a/build/classes/telas/areaFuncionario$3.class and b/build/classes/telas/areaFuncionario$3.class differ
diff --git a/build/classes/telas/areaFuncionario$4.class b/build/classes/telas/areaFuncionario$4.class
index 40fdcf8..e0c7568 100644
Binary files a/build/classes/telas/areaFuncionario$4.class and b/build/classes/telas/areaFuncionario$4.class differ
diff --git a/build/classes/telas/areaFuncionario.class b/build/classes/telas/areaFuncionario.class
index a808402..8d59e7a 100644
Binary files a/build/classes/telas/areaFuncionario.class and b/build/classes/telas/areaFuncionario.class differ
diff --git a/build/classes/telas/areaFuncionario.form b/build/classes/telas/areaFuncionario.form
index 9618935..e7c72c9 100644
--- a/build/classes/telas/areaFuncionario.form
+++ b/build/classes/telas/areaFuncionario.form
@@ -19,38 +19,232 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,7 +260,7 @@
-
+
@@ -85,13 +279,21 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -99,8 +301,9 @@
+
-
+
@@ -132,7 +335,7 @@
-
+
@@ -251,5 +454,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/classes/telas/areaGerente.form b/build/classes/telas/areaGerente.form
index 5d716f0..9c95351 100644
--- a/build/classes/telas/areaGerente.form
+++ b/build/classes/telas/areaGerente.form
@@ -70,7 +70,7 @@
-
+
@@ -149,7 +149,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -314,7 +318,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -550,7 +558,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -666,6 +678,9 @@
+
+
+
@@ -676,13 +691,16 @@
+
+
+
-
+
diff --git a/build/classes/telas/telaLogin$1.class b/build/classes/telas/telaLogin$1.class
index 4d04b30..3f2677d 100644
Binary files a/build/classes/telas/telaLogin$1.class and b/build/classes/telas/telaLogin$1.class differ
diff --git a/build/classes/telas/telaLogin.form b/build/classes/telas/telaLogin.form
index aec091d..14b8576 100644
--- a/build/classes/telas/telaLogin.form
+++ b/build/classes/telas/telaLogin.form
@@ -19,99 +19,120 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
+
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -123,21 +144,22 @@
+
+
+
+
+
+
-
-
-
-
-
-
+
@@ -152,7 +174,7 @@
-
+
@@ -160,18 +182,21 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/classes/telas/telaPagamento$1.class b/build/classes/telas/telaPagamento$1.class
index 0341d92..49fd70c 100644
Binary files a/build/classes/telas/telaPagamento$1.class and b/build/classes/telas/telaPagamento$1.class differ
diff --git a/build/classes/telas/telaPagamento.class b/build/classes/telas/telaPagamento.class
index a31b75d..7193429 100644
Binary files a/build/classes/telas/telaPagamento.class and b/build/classes/telas/telaPagamento.class differ
diff --git a/build/classes/telas/telaPagamento.form b/build/classes/telas/telaPagamento.form
index 59498b9..aa604af 100644
--- a/build/classes/telas/telaPagamento.form
+++ b/build/classes/telas/telaPagamento.form
@@ -1,8 +1,13 @@
+
+
+
+
+
+
+
@@ -157,6 +165,9 @@
+
+
+
@@ -165,6 +176,9 @@
+
+
+
@@ -177,5 +191,16 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/classes/telas/verCarrinho.form b/build/classes/telas/verCarrinho.form
index baaf9d5..ff486d0 100644
--- a/build/classes/telas/verCarrinho.form
+++ b/build/classes/telas/verCarrinho.form
@@ -21,181 +21,212 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
+
+
+
+
+
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index edbd425..c8c83d2 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -3,6 +3,7 @@
+<<<<<<< Updated upstream
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/cadastarGerente.java
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/teste.java
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/Menu.java
@@ -13,7 +14,31 @@
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/areaCliente.java
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/areaFuncionario.java
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/telaPagamento.java
+=======
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/Menu.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/cadastrarCliente.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/ControleClientes.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/areaCliente.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/AreaGerenteTeste.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/areaFuncionario.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/telaPagamento.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Produto.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/CriarNovoProduto.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Estoque.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/telaLogin.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/verProdutos_a.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Cliente.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Pedido.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/cadastarGerente.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/teste.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Carrinho.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Gerente.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/verProdutos.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/ControleEstoque.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Pagamento.java
+>>>>>>> Stashed changes
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/verCarrinho.java
+ file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Usuario.java
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/classes/Funcionario.java
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/cadastrarFuncionario.java
file:/E:/@Meus%20Documentos/Documents/NetBeansProjects/BookStockManager/BookStockManager/src/telas/ControleFuncionarios.java
diff --git a/src/classes/Carrinho.java b/src/classes/Carrinho.java
index f40f442..dd65f48 100644
--- a/src/classes/Carrinho.java
+++ b/src/classes/Carrinho.java
@@ -8,7 +8,12 @@ public class Carrinho {
protected int numCarrinho;
protected Date data;
protected double total;
+<<<<<<< Updated upstream
protected List produtos;
+=======
+ public static ArrayList listaProdutos = new ArrayList();
+ public static ArrayList listaCarrinho = new ArrayList();
+>>>>>>> Stashed changes
//Construtor de carrinho. Um vazio e outro com os atributos dados
public Carrinho() {
@@ -20,6 +25,32 @@ public Carrinho(int numCarrinho, Date data, double total, List produtos)
this.total = total;
this.produtos = produtos;
}
+
+ public String mostarProdutos(){
+ String resultado="";
+ for(Produto item: listaProdutos){
+ resultado = resultado +item.getTitulo()+" X "+item.getQuantidadeComprada()+" , ";
+ }
+ return resultado;
+ }
+ public Carrinho(int numCarrinho, String data, double total,ArrayList listaProdutos) {
+ this.numCarrinho = numCarrinho;
+ this.data = data;
+ this.total = total;
+ this.listaProdutos = listaProdutos;
+ }
+
+ public static void setListaProdutos(ArrayList listaProdutos) {
+ Carrinho.listaProdutos = listaProdutos;
+ }
+
+ public static void setListaCarrinho(ArrayList listaCarrinho) {
+ Carrinho.listaCarrinho = listaCarrinho;
+ }
+
+
+
+
//Métodos getters e setters para cada um dos atributos
@@ -47,9 +78,20 @@ public void setTotal(double total) {
this.total = total;
}
+<<<<<<< Updated upstream
public List getProdutos() {
return produtos;
}
+=======
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+>>>>>>> Stashed changes
public void setProdutos(List produtos) {
this.produtos = produtos;
diff --git a/src/classes/Cliente.java b/src/classes/Cliente.java
index 87704b9..a0b3f4e 100644
--- a/src/classes/Cliente.java
+++ b/src/classes/Cliente.java
@@ -97,6 +97,23 @@ public static int getIndex_cliente() {
return index_cliente;
}
+ public boolean loginCliente(String email, String senha){
+ if(this.email.equals(email) && this.senha.equals(senha)){
+ return true;
+ }else{
+ return false;
+ }
+
+ }
+ @Override
+ public String toString(){
+ String resultado = super.toString();
+ resultado += "Endereço: "+this.endereco + "\n"
+ +"Data Nascimento: "+this.dataNascimento+"\n"
+ +" Celular: "+this.celular;
+ return resultado;
+ }
+
diff --git a/src/classes/Funcionario.java b/src/classes/Funcionario.java
index ea2dacf..3bc4037 100644
--- a/src/classes/Funcionario.java
+++ b/src/classes/Funcionario.java
@@ -40,7 +40,17 @@ public void setCadastroFuncionario(String cadastroFuncionario) {
@Override
public String toString() {
- return "Funcionario{" + "cadastroFuncionario=" + cadastroFuncionario + '}';
+ String resultado = super.toString();
+ resultado += resultado + "cadastro de Funcionário: "+this.getCadastroFuncionario();
+ return resultado;
+ }
+
+ public boolean loginFuncionario(String email, String senha){
+ if(this.email.equals(email)&&this.senha.equals(senha)){
+ return true;
+ }else{
+ return false;
+ }
}
diff --git a/src/classes/Gerente.java b/src/classes/Gerente.java
index 7467f07..9578ea6 100644
--- a/src/classes/Gerente.java
+++ b/src/classes/Gerente.java
@@ -31,6 +31,20 @@ public void setCadastroGerente(String cadastroGerente) {
this.cadastroGerente = cadastroGerente;
}
+ public boolean LoginGerente(String email,String senha){
+ if(this.email.equals(email)&&this.senha.equals(senha)){
+ return true;
+ }else{
+ return false;
+ }
+ }
+ @Override
+ public String toString(){
+ String resultado = super.toString();
+ resultado += "cadastro Gerente: "+this.getCadastroGerente();
+ return resultado;
+ }
+
}
diff --git a/src/classes/Pagamento.java b/src/classes/Pagamento.java
index 203e869..7c5ced2 100644
--- a/src/classes/Pagamento.java
+++ b/src/classes/Pagamento.java
@@ -1,5 +1,6 @@
package classes;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -7,6 +8,9 @@ public class Pagamento extends Carrinho{
private String formaPagamento;
private String senha;
private Pedido pedido;
+ public static ArrayList listaCarrinhos = new ArrayList();
+ public static int indiceCarrinho;
+ public static ArrayList listaCarrinhosAntigos = new ArrayList();
public Pagamento(String formaPagamento, String senha, int numCarrinho, Date data, double total, List produtos) {
super(numCarrinho, data, total, produtos);
@@ -44,5 +48,13 @@ public boolean Pagar(String senha){
return false;
}
}
+ @Override
+ public String mostarProdutos(){
+ String resultado="";
+ for(Produto item: listaProdutos){
+ resultado = resultado +item.getTitulo()+" X "+item.getQuantidadeComprada()+",";
+ }
+ return resultado;
+ }
}
diff --git a/src/imagens/Telas/BuscarProdutos.png b/src/imagens/Telas/BuscarProdutos.png
new file mode 100644
index 0000000..e029052
Binary files /dev/null and b/src/imagens/Telas/BuscarProdutos.png differ
diff --git a/src/imagens/Telas/Login.png b/src/imagens/Telas/Login.png
new file mode 100644
index 0000000..5202816
Binary files /dev/null and b/src/imagens/Telas/Login.png differ
diff --git a/src/imagens/Telas/Menu.png b/src/imagens/Telas/Menu.png
new file mode 100644
index 0000000..9f40803
Binary files /dev/null and b/src/imagens/Telas/Menu.png differ
diff --git a/src/imagens/Telas/VerCarrinho.png b/src/imagens/Telas/VerCarrinho.png
new file mode 100644
index 0000000..aae14a6
Binary files /dev/null and b/src/imagens/Telas/VerCarrinho.png differ
diff --git "a/src/imagens/Telas/\303\201reaCliente.png" "b/src/imagens/Telas/\303\201reaCliente.png"
new file mode 100644
index 0000000..8793c2b
Binary files /dev/null and "b/src/imagens/Telas/\303\201reaCliente.png" differ
diff --git "a/src/imagens/Telas/\303\201reaFuncion\303\241rio.png" "b/src/imagens/Telas/\303\201reaFuncion\303\241rio.png"
new file mode 100644
index 0000000..f0490a9
Binary files /dev/null and "b/src/imagens/Telas/\303\201reaFuncion\303\241rio.png" differ
diff --git "a/src/imagens/Telas/\303\201reaGerente.png" "b/src/imagens/Telas/\303\201reaGerente.png"
new file mode 100644
index 0000000..33e7429
Binary files /dev/null and "b/src/imagens/Telas/\303\201reaGerente.png" differ
diff --git a/src/telas/ControleEstoque.form b/src/telas/ControleEstoque.form
index 68831a7..ec4c27d 100644
--- a/src/telas/ControleEstoque.form
+++ b/src/telas/ControleEstoque.form
@@ -24,14 +24,14 @@
-
-
-
-
-
+
+
+
+
+
@@ -39,9 +39,9 @@
-
+
-
+
@@ -52,16 +52,16 @@
-
-
-
-
-
+<<<<<<< Updated upstream
+=======
+
+
+>>>>>>> Stashed changes
@@ -71,15 +71,18 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -95,50 +98,77 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+<<<<<<< Updated upstream
@@ -167,9 +197,23 @@
+=======
+>>>>>>> Stashed changes
+
+
+
+
+
+
+
+
+
+
+
+
@@ -188,11 +232,6 @@
-
-
-
-
-
@@ -305,6 +344,9 @@
+
+
+
@@ -322,6 +364,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -346,6 +403,9 @@
+
+
+
diff --git a/src/telas/ControleEstoque.java b/src/telas/ControleEstoque.java
index 4de618d..16cca3c 100644
--- a/src/telas/ControleEstoque.java
+++ b/src/telas/ControleEstoque.java
@@ -4,6 +4,14 @@
*/
package telas;
+<<<<<<< Updated upstream
+=======
+import static classes.Estoque.estoque;
+import classes.Produto;
+import javax.swing.JOptionPane;
+import javax.swing.table.DefaultTableModel;
+
+>>>>>>> Stashed changes
/**
*
* @author Yuri
@@ -44,7 +52,7 @@ public void enableEstoqueFields(){
txtTituloEstoque.setEnabled(true);
txtPrecoEstoque.setEnabled(true);
txtQuantiaEstoque.setEnabled(true);
- txtCodigoEstoque.setEnabled(true);
+ txtCodigoEstoque.setEnabled(false);
txtDescricaoEstoque.setEnabled(true);
lblTituloEstoque.setEnabled(true);
@@ -65,6 +73,45 @@ public void disableEstoqueButtons(){
btnBuscar.setEnabled(false);
}
+<<<<<<< Updated upstream
+=======
+
+ public void clearEstoqueFields(){
+ txtTituloEstoque.setText("");
+ txtPrecoEstoque.setText("");
+ txtQuantiaEstoque.setText("");
+ txtCodigoEstoque.setText("");
+ txtDescricaoEstoque.setText("");
+ }
+
+
+ private void carregarTabelaProdutos(){
+ DefaultTableModel modeloTabelaProdutos = new DefaultTableModel(new Object[] {"Título","Autor","Gênero","Preço","Quantia Estoque","Código Produto","Descrição"},0);
+
+ for(int i=0;i>>>>>> Stashed changes
/**
* This method is called from within the constructor to initialize the form.
@@ -78,7 +125,6 @@ private void initComponents() {
jPanel2 = new javax.swing.JPanel();
txtTituloEstoque = new javax.swing.JTextField();
txtQuantiaEstoque = new javax.swing.JTextField();
- txtDescricaoEstoque = new javax.swing.JTextField();
txtPrecoEstoque = new javax.swing.JTextField();
txtCodigoEstoque = new javax.swing.JTextField();
lblTituloEstoque = new javax.swing.JLabel();
@@ -93,7 +139,13 @@ private void initComponents() {
btnPesquisarItem = new javax.swing.JButton();
btnExcluirItem = new javax.swing.JButton();
lblControleEstoque = new javax.swing.JLabel();
+<<<<<<< Updated upstream
jButton1 = new javax.swing.JButton();
+=======
+ btnCriar = new javax.swing.JButton();
+ jScrollPane3 = new javax.swing.JScrollPane();
+ txtDescricaoEstoque = new javax.swing.JTextArea();
+>>>>>>> Stashed changes
jScrollPane1 = new javax.swing.JScrollPane();
jTable1 = new javax.swing.JTable();
@@ -109,8 +161,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
txtQuantiaEstoque.setToolTipText("insira a quantia em estoque");
- txtDescricaoEstoque.setToolTipText("insira a descrição");
-
txtPrecoEstoque.setToolTipText("insira o preço do produto");
txtCodigoEstoque.setToolTipText("insira o código do produto");
@@ -172,6 +222,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
btnExcluirItem.setFont(new java.awt.Font("Segoe UI", 1, 18)); // NOI18N
btnExcluirItem.setText("Excluir");
btnExcluirItem.setToolTipText("Excluir algum produto do estoque");
+ btnExcluirItem.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnExcluirItemActionPerformed(evt);
+ }
+ });
lblControleEstoque.setFont(new java.awt.Font("Segoe UI", 1, 24)); // NOI18N
lblControleEstoque.setText("Controle do estoque");
@@ -179,19 +234,24 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1.setFont(new java.awt.Font("Segoe UI", 1, 18)); // NOI18N
jButton1.setText("Criar Item");
+ txtDescricaoEstoque.setColumns(20);
+ txtDescricaoEstoque.setRows(5);
+ jScrollPane3.setViewportView(txtDescricaoEstoque);
+
javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel2Layout.createSequentialGroup()
- .addGap(24, 467, Short.MAX_VALUE)
- .addComponent(lblControleEstoque)
- .addGap(386, 386, 386))
.addGroup(jPanel2Layout.createSequentialGroup()
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
+<<<<<<< Updated upstream
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jButton1)
+=======
+ .addContainerGap(40, Short.MAX_VALUE)
+ .addComponent(btnCriar)
+>>>>>>> Stashed changes
.addGap(50, 50, 50)
.addComponent(btnAlterarItem)
.addGap(65, 65, 65)
@@ -200,13 +260,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGroup(jPanel2Layout.createSequentialGroup()
.addGap(0, 0, Short.MAX_VALUE)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(lblTituloEstoque, javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(lblPrecoEstoque, javax.swing.GroupLayout.Alignment.TRAILING))
- .addGap(18, 18, 18)
- .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(txtTituloEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, 122, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(txtPrecoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, 122, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(34, 34, 34)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(lblTituloEstoque)
+ .addGap(18, 18, 18)
+ .addComponent(txtTituloEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, 122, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(lblPrecoEstoque)
+ .addGap(18, 18, 18)
+ .addComponent(txtPrecoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, 122, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addGap(35, 35, 35)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addComponent(lblCodigoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -217,43 +279,45 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGap(33, 33, 33)
.addComponent(txtQuantiaEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, 115, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)))
- .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addComponent(btnCancelarItem)
.addGap(69, 69, 69)
- .addComponent(btnExcluirItem))
- .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel2Layout.createSequentialGroup()
- .addComponent(lblDescricaoEstoque)
- .addGap(18, 18, 18)
- .addComponent(txtDescricaoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(jPanel2Layout.createSequentialGroup()
- .addGap(108, 108, 108)
- .addComponent(btnBuscar, javax.swing.GroupLayout.PREFERRED_SIZE, 83, javax.swing.GroupLayout.PREFERRED_SIZE))))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(btnPesquisarItem)
- .addGap(62, 62, 62))
+ .addComponent(btnExcluirItem)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(btnPesquisarItem)
+ .addGap(62, 62, 62))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addGap(0, 103, Short.MAX_VALUE)
+ .addComponent(lblDescricaoEstoque)
+ .addGap(29, 29, 29)
+ .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 264, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(128, 128, 128))))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addComponent(lblControleEstoque)
+ .addGap(406, 406, 406))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addComponent(btnBuscar, javax.swing.GroupLayout.PREFERRED_SIZE, 83, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(435, 435, 435))))
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(lblControleEstoque)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 41, Short.MAX_VALUE)
+ .addGroup(jPanel2Layout.createSequentialGroup()
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
+ .addGap(44, 44, 44)
+ .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(lblControleEstoque)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
- .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(lblQuantiaEstoque)
- .addComponent(txtQuantiaEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(18, 18, 18)
- .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(lblCodigoEstoque)
- .addComponent(txtCodigoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGap(9, 9, 9)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblDescricaoEstoque)
+<<<<<<< Updated upstream
.addComponent(txtDescricaoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(btnBuscar)))
@@ -273,6 +337,34 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtPrecoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblPrecoEstoque)))))
+=======
+ .addComponent(lblQuantiaEstoque)
+ .addComponent(txtQuantiaEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGap(12, 12, 12)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(txtTituloEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lblTituloEstoque))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(lblCodigoEstoque)
+ .addComponent(txtCodigoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(txtPrecoEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lblPrecoEstoque)))))))
+ .addGap(4, 4, 4)
+ .addComponent(btnBuscar)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(btnAlterarItem)
+ .addComponent(btnCancelarItem)
+ .addComponent(btnSalvarItem)
+ .addComponent(btnPesquisarItem)
+ .addComponent(btnExcluirItem)
+ .addComponent(btnCriar))
+ .addGap(0, 12, Short.MAX_VALUE))
+>>>>>>> Stashed changes
);
jScrollPane1.setToolTipText("tabela com os produtos em estoque");
@@ -296,27 +388,45 @@ public Class getColumnClass(int columnIndex) {
return types [columnIndex];
}
});
+<<<<<<< Updated upstream
jScrollPane1.setViewportView(jTable1);
+=======
+ tblMostraProdutos.addMouseListener(new java.awt.event.MouseAdapter() {
+ public void mouseClicked(java.awt.event.MouseEvent evt) {
+ tblMostraProdutosMouseClicked(evt);
+ }
+ });
+ jScrollPane1.setViewportView(tblMostraProdutos);
+ if (tblMostraProdutos.getColumnModel().getColumnCount() > 0) {
+ tblMostraProdutos.getColumnModel().getColumn(0).setPreferredWidth(50);
+ tblMostraProdutos.getColumnModel().getColumn(1).setPreferredWidth(20);
+ tblMostraProdutos.getColumnModel().getColumn(2).setPreferredWidth(15);
+ tblMostraProdutos.getColumnModel().getColumn(3).setPreferredWidth(8);
+ tblMostraProdutos.getColumnModel().getColumn(4).setPreferredWidth(3);
+ tblMostraProdutos.getColumnModel().getColumn(5).setPreferredWidth(5);
+ tblMostraProdutos.getColumnModel().getColumn(6).setPreferredWidth(100);
+ }
+>>>>>>> Stashed changes
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 0, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
.addGap(79, 79, 79)
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 820, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(428, Short.MAX_VALUE))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(18, 18, 18)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 217, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(47, Short.MAX_VALUE))
);
pack();
@@ -332,6 +442,7 @@ private void btnCancelarItemActionPerformed(java.awt.event.ActionEvent evt) {//G
disableEstoqueFields();
disableEstoqueButtons();
//btnAddItem.setEnabled(true);
+ clearEstoqueFields();
btnPesquisarItem.setEnabled(true);
}//GEN-LAST:event_btnCancelarItemActionPerformed
@@ -356,8 +467,58 @@ private void btnPesquisarItemActionPerformed(java.awt.event.ActionEvent evt) {//
private void btnAlterarItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAlterarItemActionPerformed
// TODO add your handling code here:
+ enableEstoqueFields();
+ btnSalvarItem.setEnabled(true);
+ btnCancelarItem.setEnabled(true);
+ btnPesquisarItem.setEnabled(true);
+
+
}//GEN-LAST:event_btnAlterarItemActionPerformed
+<<<<<<< Updated upstream
+=======
+ private void btnCriarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCriarActionPerformed
+ // TODO add your handling code here:
+ new CriarNovoProduto().setVisible(true);
+ btnSalvarItem.setEnabled(true);
+
+ lblTituloEstoque.setEnabled(true);
+ }//GEN-LAST:event_btnCriarActionPerformed
+
+ private void tblMostraProdutosMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_tblMostraProdutosMouseClicked
+ // TODO add your handling code here:
+
+ btnAlterarItem.setEnabled(true);
+ btnExcluirItem.setEnabled(true);
+
+
+ int i = tblMostraProdutos.getSelectedRow();
+ System.out.println(i);
+ if(i>=0 && i=0 && i>>>>>> Stashed changes
/**
* @param args the command line arguments
*/
@@ -403,7 +564,11 @@ public void run() {
private javax.swing.JButton jButton1;
private javax.swing.JPanel jPanel2;
private javax.swing.JScrollPane jScrollPane1;
+<<<<<<< Updated upstream
private javax.swing.JTable jTable1;
+=======
+ private javax.swing.JScrollPane jScrollPane3;
+>>>>>>> Stashed changes
private javax.swing.JLabel lblCodigoEstoque;
private javax.swing.JLabel lblControleEstoque;
private javax.swing.JLabel lblDescricaoEstoque;
@@ -411,7 +576,7 @@ public void run() {
private javax.swing.JLabel lblQuantiaEstoque;
private javax.swing.JLabel lblTituloEstoque;
private javax.swing.JTextField txtCodigoEstoque;
- private javax.swing.JTextField txtDescricaoEstoque;
+ private javax.swing.JTextArea txtDescricaoEstoque;
private javax.swing.JTextField txtPrecoEstoque;
private javax.swing.JTextField txtQuantiaEstoque;
private javax.swing.JTextField txtTituloEstoque;
diff --git a/src/telas/CriarNovoProduto.form b/src/telas/CriarNovoProduto.form
new file mode 100644
index 0000000..02d5396
--- /dev/null
+++ b/src/telas/CriarNovoProduto.form
@@ -0,0 +1,220 @@
+
+
+
diff --git a/src/telas/CriarNovoProduto.java b/src/telas/CriarNovoProduto.java
new file mode 100644
index 0000000..2e6dadc
--- /dev/null
+++ b/src/telas/CriarNovoProduto.java
@@ -0,0 +1,267 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template
+ */
+package telas;
+
+import static classes.Estoque.estoque;
+import classes.Produto;
+import javax.swing.JOptionPane;
+
+/**
+ *
+ * @author Yuri
+ */
+public class CriarNovoProduto extends javax.swing.JFrame {
+
+ /**
+ * Creates new form CriarNovoProduto
+ */
+ public CriarNovoProduto() {
+ initComponents();
+ }
+
+ /**
+ * This method is called from within the constructor to initialize the form.
+ * WARNING: Do NOT modify this code. The content of this method is always
+ * regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ jLabel1 = new javax.swing.JLabel();
+ jLabel2 = new javax.swing.JLabel();
+ jLabel3 = new javax.swing.JLabel();
+ jLabel4 = new javax.swing.JLabel();
+ jLabel5 = new javax.swing.JLabel();
+ jLabel6 = new javax.swing.JLabel();
+ jLabel7 = new javax.swing.JLabel();
+ txtTitulo = new javax.swing.JTextField();
+ txtAutor = new javax.swing.JTextField();
+ txtGenero = new javax.swing.JTextField();
+ txtPreco = new javax.swing.JTextField();
+ txtQuantiaEstoque = new javax.swing.JTextField();
+ jScrollPane1 = new javax.swing.JScrollPane();
+ txtAreaDescricao = new javax.swing.JTextArea();
+ btnCriarNovoItem = new javax.swing.JButton();
+ btnCancelar = new javax.swing.JButton();
+ jLabel8 = new javax.swing.JLabel();
+ txtCodigoProduto = new javax.swing.JTextField();
+
+ setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+ setTitle("Cadastro de novo produto");
+
+ jLabel1.setText("Cadastrar novo Produto");
+
+ jLabel2.setText("Título");
+
+ jLabel3.setText("Autor");
+
+ jLabel4.setText("Gênero");
+
+ jLabel5.setText("Preço");
+
+ jLabel6.setText("Quantidade Estoque");
+
+ jLabel7.setText("Descrição");
+
+ txtTitulo.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ txtTituloActionPerformed(evt);
+ }
+ });
+
+ txtAreaDescricao.setColumns(20);
+ txtAreaDescricao.setRows(5);
+ jScrollPane1.setViewportView(txtAreaDescricao);
+
+ btnCriarNovoItem.setText("Criar novo Item");
+ btnCriarNovoItem.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnCriarNovoItemActionPerformed(evt);
+ }
+ });
+
+ btnCancelar.setText("Cancelar");
+ btnCancelar.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnCancelarActionPerformed(evt);
+ }
+ });
+
+ jLabel8.setText("Código Produto");
+ jLabel8.setToolTipText("");
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+ getContentPane().setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(56, 56, 56)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jLabel3)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(txtAutor, javax.swing.GroupLayout.PREFERRED_SIZE, 262, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jLabel2)
+ .addGap(29, 29, 29)
+ .addComponent(txtTitulo, javax.swing.GroupLayout.PREFERRED_SIZE, 262, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(jLabel4)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(btnCriarNovoItem)
+ .addComponent(txtGenero, javax.swing.GroupLayout.PREFERRED_SIZE, 262, javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jLabel5)
+ .addGap(97, 97, 97)
+ .addComponent(txtPreco, javax.swing.GroupLayout.PREFERRED_SIZE, 262, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(18, 18, 18)
+ .addComponent(jLabel8)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(txtCodigoProduto, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel6)
+ .addComponent(jLabel7))
+ .addGap(18, 18, 18)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(txtQuantiaEstoque, javax.swing.GroupLayout.DEFAULT_SIZE, 262, Short.MAX_VALUE)
+ .addComponent(jScrollPane1)))))
+ .addGroup(layout.createSequentialGroup()
+ .addGap(195, 195, 195)
+ .addComponent(btnCancelar))))
+ .addGroup(layout.createSequentialGroup()
+ .addGap(479, 479, 479)
+ .addComponent(jLabel1)))
+ .addContainerGap(213, Short.MAX_VALUE))
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jLabel1)
+ .addGap(18, 18, 18)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel2)
+ .addComponent(jLabel5)
+ .addComponent(txtTitulo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(txtPreco, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel8)
+ .addComponent(txtCodigoProduto, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(25, 25, 25)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel3)
+ .addComponent(jLabel6)
+ .addComponent(txtAutor, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(txtQuantiaEstoque, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(45, 45, 45)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel4)
+ .addComponent(jLabel7)
+ .addComponent(txtGenero, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(32, 32, 32)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(btnCriarNovoItem)
+ .addComponent(btnCancelar))
+ .addGap(0, 368, Short.MAX_VALUE))
+ );
+
+ pack();
+ }// //GEN-END:initComponents
+
+ private void txtTituloActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtTituloActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_txtTituloActionPerformed
+
+ private void btnCriarNovoItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCriarNovoItemActionPerformed
+ // TODO add your handling code here:
+
+ String titulo = txtTitulo.getText();
+ String autor = txtAutor.getText();
+ String genero = txtGenero.getText();
+ double preco = Double.parseDouble(txtPreco.getText());
+ int qntEstoque = Integer.parseInt(txtQuantiaEstoque.getText());
+ String codigoProduto = txtCodigoProduto.getText();
+ String descricao = txtAreaDescricao.getText();
+
+ Produto produto1 = new Produto(titulo,autor,genero,preco,qntEstoque,codigoProduto,descricao);
+
+ estoque.add(produto1);
+ JOptionPane.showMessageDialog(null,"Item cadastrado com sucesso!", "Novo produto criado!",JOptionPane.PLAIN_MESSAGE);
+ this.setVisible(false);
+
+
+
+ }//GEN-LAST:event_btnCriarNovoItemActionPerformed
+
+ private void btnCancelarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelarActionPerformed
+ // TODO add your handling code here:
+ this.setVisible(false);
+ }//GEN-LAST:event_btnCancelarActionPerformed
+
+ /**
+ * @param args the command line arguments
+ */
+ public static void main(String args[]) {
+ /* Set the Nimbus look and feel */
+ //
+ /* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel.
+ * For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
+ */
+ try {
+ for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) {
+ if ("Nimbus".equals(info.getName())) {
+ javax.swing.UIManager.setLookAndFeel(info.getClassName());
+ break;
+ }
+ }
+ } catch (ClassNotFoundException ex) {
+ java.util.logging.Logger.getLogger(CriarNovoProduto.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+ } catch (InstantiationException ex) {
+ java.util.logging.Logger.getLogger(CriarNovoProduto.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+ } catch (IllegalAccessException ex) {
+ java.util.logging.Logger.getLogger(CriarNovoProduto.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+ } catch (javax.swing.UnsupportedLookAndFeelException ex) {
+ java.util.logging.Logger.getLogger(CriarNovoProduto.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+ }
+ //
+
+ /* Create and display the form */
+ java.awt.EventQueue.invokeLater(new Runnable() {
+ public void run() {
+ new CriarNovoProduto().setVisible(true);
+ }
+ });
+ }
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton btnCancelar;
+ private javax.swing.JButton btnCriarNovoItem;
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JLabel jLabel2;
+ private javax.swing.JLabel jLabel3;
+ private javax.swing.JLabel jLabel4;
+ private javax.swing.JLabel jLabel5;
+ private javax.swing.JLabel jLabel6;
+ private javax.swing.JLabel jLabel7;
+ private javax.swing.JLabel jLabel8;
+ private javax.swing.JScrollPane jScrollPane1;
+ private javax.swing.JTextArea txtAreaDescricao;
+ private javax.swing.JTextField txtAutor;
+ private javax.swing.JTextField txtCodigoProduto;
+ private javax.swing.JTextField txtGenero;
+ private javax.swing.JTextField txtPreco;
+ private javax.swing.JTextField txtQuantiaEstoque;
+ private javax.swing.JTextField txtTitulo;
+ // End of variables declaration//GEN-END:variables
+}
diff --git a/src/telas/Menu.form b/src/telas/Menu.form
index b2c096d..5c0bd22 100644
--- a/src/telas/Menu.form
+++ b/src/telas/Menu.form
@@ -47,7 +47,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -61,7 +65,7 @@
-
+
@@ -70,7 +74,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -99,13 +107,18 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -118,13 +131,18 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -137,13 +155,18 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -156,13 +179,18 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -175,32 +203,42 @@
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
-
+
+
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -281,12 +319,20 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
diff --git a/src/telas/Menu.java b/src/telas/Menu.java
index c5fe0d7..27d94a4 100644
--- a/src/telas/Menu.java
+++ b/src/telas/Menu.java
@@ -56,6 +56,7 @@ public Menu() {
setLocationRelativeTo(null);
this.setExtendedState(MAXIMIZED_BOTH);
+<<<<<<< Updated upstream
verificarLogin(logado);
Gerente gerente;
gerente = new Gerente("admin","admin","admin@gmail.com","admin");
@@ -68,6 +69,11 @@ public Menu() {
listaClientes.add(cliente);
+=======
+ verificarLogin(logado, user);
+ criarContasIniciais();
+ atualizarBotoes();
+>>>>>>> Stashed changes
}
/**
* This method is called from within the constructor to initialize the form.
@@ -75,6 +81,114 @@ public Menu() {
* regenerated by the Form Editor.
*/
@SuppressWarnings("unchecked")
+<<<<<<< Updated upstream
+=======
+ public void criarContasIniciais(){
+ if(listaFuncionarios.size()==0 & listaClientes.size()==0 & estoque.size()==0){
+ Gerente gerente;
+ gerente = new Gerente("admin","000.000.000-00","admin@gmail.com","admin");
+ listaGerente.add(gerente);
+ Funcionario funcionario;
+ funcionario = new Funcionario("func","000.000.000-00","func@gmail.com","func");
+ listaFuncionarios.add(funcionario);
+ Cliente cliente = new Cliente("user","000.000.000-00","user@gmail.com","user","Pernambuco","10/05/1990","999-9999");
+ listaClientes.add(cliente);
+ Produto produto1 = new Produto("Eragon","Christopher Paolini","Aventura",15.69,3,"1","Eragon se torna um cavaleiro de Dragão");
+ estoque.add(produto1);
+
+ }
+ }
+ public void verificarLogin(boolean logado, String user){
+ // Habilitar/desabilitar botão de Logout
+ if(logado==true){
+ btnLogout.setVisible(true);
+ btnLogin.setVisible(false);
+ if(user.equals("cliente")){
+ lblLogin.setVisible(true);
+ lblLogin.setText("Você entrou como cliente!");
+ }else if(user.equals("funcionario")){
+ lblLogin.setVisible(true);
+ lblLogin.setText("Você entrou como funcionário");
+ }else if(user.equals("gerente")){
+ lblLogin.setVisible(true);
+ lblLogin.setText("Você entrou como gerente");
+ }
+ }else{
+ btnLogout.setVisible(false);
+ btnLogin.setVisible(true);
+ lblLogin.setVisible(false);
+ }
+ }
+ public void atualizarLogin(){
+ // Habilitar/desabilitar botão de Logout
+ if(logado==true){
+ btnLogout.setVisible(true);
+ btnLogin.setVisible(false);
+ if(user.equals("cliente")){
+ lblLogin.setVisible(true);
+ lblLogin.setText("Você entrou como cliente!");
+ }else if(user.equals("funcionario")){
+ lblLogin.setVisible(true);
+ lblLogin.setText("Você entrou como funcionário");
+ }else if(user.equals("gerente")){
+ lblLogin.setVisible(true);
+ lblLogin.setText("Você entrou como gerente");
+ }
+ }else{
+ btnLogout.setVisible(false);
+ btnLogin.setVisible(true);
+ lblLogin.setVisible(false);
+ }
+ }
+ public void atualizarBotoes(){
+ if(logado==true){
+ if(user.equals("")){
+ btnCliente.setText("Criar conta de Cliente");
+ btnFuncionario.setEnabled(false);
+ btnGerente.setEnabled(false);
+ btnAtualizarEstoque.setEnabled(false);
+ btnVerCarrinho.setEnabled(false);
+ }
+ if(user.equals("cliente")){
+ btnCliente.setText("Área do Cliente");
+ btnFuncionario.setEnabled(false);
+ btnGerente.setEnabled(false);
+ btnAtualizarEstoque.setEnabled(false);
+ btnVerCarrinho.setEnabled(true);
+
+
+ }
+ if(user.equals("funcionario")){
+ btnCliente.setText("Criar conta de Cliente");
+ btnFuncionario.setEnabled(true);
+ btnFuncionario.setText("Área do Funcionário");
+ btnGerente.setEnabled(false);
+ btnAtualizarEstoque.setEnabled(true);
+ btnVerCarrinho.setEnabled(true);
+
+ }
+ if(user.equals("gerente")){
+ btnCliente.setText("Criar conta de Cliente");
+ btnFuncionario.setEnabled(true);
+ btnFuncionario.setText("Criar Funcionário");
+ btnGerente.setEnabled(true);
+ btnGerente.setText("Área do Gerente");
+ btnAtualizarEstoque.setEnabled(true);
+ btnVerCarrinho.setEnabled(true);
+
+ }
+
+ }else{
+ btnCliente.setText("Criar conta de Cliente");
+ btnFuncionario.setEnabled(false);
+ btnGerente.setEnabled(false);
+ btnAtualizarEstoque.setEnabled(false);
+ btnVerCarrinho.setEnabled(false);
+
+ }
+ }
+
+>>>>>>> Stashed changes
// //GEN-BEGIN:initComponents
private void initComponents() {
@@ -105,10 +219,14 @@ private void initComponents() {
jPanel1.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
- lblLogin.setFont(new java.awt.Font("Segoe UI", 1, 48)); // NOI18N
+ lblLogin.setFont(new java.awt.Font("Old London", 1, 60)); // NOI18N
lblLogin.setForeground(new java.awt.Color(255, 0, 0));
lblLogin.setText("Você entrou como cliente");
+<<<<<<< Updated upstream
jPanel1.add(lblLogin, new org.netbeans.lib.awtextra.AbsoluteConstraints(570, 60, -1, -1));
+=======
+ jPanel1.add(lblLogin, new org.netbeans.lib.awtextra.AbsoluteConstraints(220, 20, 890, 60));
+>>>>>>> Stashed changes
lblBookStockManager.setFont(new java.awt.Font("Segoe UI", 1, 48)); // NOI18N
lblBookStockManager.setForeground(new java.awt.Color(255, 255, 255));
@@ -118,62 +236,92 @@ private void initComponents() {
btnAtualizarEstoque.setFont(new java.awt.Font("Segoe UI", 1, 36)); // NOI18N
btnAtualizarEstoque.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/simbolos/business_inventory_maintenance_product_box_boxes_2326_64.png"))); // NOI18N
btnAtualizarEstoque.setText("Atualizar Estoque");
+ btnAtualizarEstoque.setContentAreaFilled(false);
btnAtualizarEstoque.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnAtualizarEstoqueActionPerformed(evt);
}
});
+<<<<<<< Updated upstream
jPanel1.add(btnAtualizarEstoque, new org.netbeans.lib.awtextra.AbsoluteConstraints(1270, 700, 400, 130));
+=======
+ jPanel1.add(btnAtualizarEstoque, new org.netbeans.lib.awtextra.AbsoluteConstraints(1410, 620, 400, 130));
+>>>>>>> Stashed changes
btnVerCarrinho.setFont(new java.awt.Font("Segoe UI", 1, 36)); // NOI18N
btnVerCarrinho.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/simbolos/4105931-add-to-cart-buy-cart-sell-shop-shopping-cart_113919_64.png"))); // NOI18N
btnVerCarrinho.setText("Ver carrinho");
+ btnVerCarrinho.setContentAreaFilled(false);
btnVerCarrinho.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnVerCarrinhoActionPerformed(evt);
}
});
+<<<<<<< Updated upstream
jPanel1.add(btnVerCarrinho, new org.netbeans.lib.awtextra.AbsoluteConstraints(1270, 410, 400, 130));
+=======
+ jPanel1.add(btnVerCarrinho, new org.netbeans.lib.awtextra.AbsoluteConstraints(1400, 400, 400, 130));
+>>>>>>> Stashed changes
btnPesquisar.setFont(new java.awt.Font("Segoe UI", 1, 36)); // NOI18N
btnPesquisar.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/simbolos/searchmagnifierinterfacesymbol1_79893_64.png"))); // NOI18N
btnPesquisar.setText("Buscar Produto");
+ btnPesquisar.setContentAreaFilled(false);
btnPesquisar.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnPesquisarActionPerformed(evt);
}
});
+<<<<<<< Updated upstream
jPanel1.add(btnPesquisar, new org.netbeans.lib.awtextra.AbsoluteConstraints(750, 410, 400, 130));
+=======
+ jPanel1.add(btnPesquisar, new org.netbeans.lib.awtextra.AbsoluteConstraints(790, 380, 400, 130));
+>>>>>>> Stashed changes
btnFuncionario.setFont(new java.awt.Font("Segoe UI", 1, 36)); // NOI18N
btnFuncionario.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/simbolos/technicalsupport_support_representative_person_people_man_1641_64.png"))); // NOI18N
btnFuncionario.setText("Funcionário");
+ btnFuncionario.setContentAreaFilled(false);
btnFuncionario.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnFuncionarioActionPerformed(evt);
}
});
+<<<<<<< Updated upstream
jPanel1.add(btnFuncionario, new org.netbeans.lib.awtextra.AbsoluteConstraints(250, 700, 400, 130));
+=======
+ jPanel1.add(btnFuncionario, new org.netbeans.lib.awtextra.AbsoluteConstraints(100, 620, 400, 130));
+>>>>>>> Stashed changes
btnGerente.setFont(new java.awt.Font("Segoe UI", 1, 36)); // NOI18N
btnGerente.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/simbolos/customer_person_people_man_you_1625_64.png"))); // NOI18N
btnGerente.setText("Gerente");
+ btnGerente.setContentAreaFilled(false);
btnGerente.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnGerenteActionPerformed(evt);
}
});
+<<<<<<< Updated upstream
jPanel1.add(btnGerente, new org.netbeans.lib.awtextra.AbsoluteConstraints(750, 700, 400, 130));
+=======
+ jPanel1.add(btnGerente, new org.netbeans.lib.awtextra.AbsoluteConstraints(780, 610, 400, 130));
+>>>>>>> Stashed changes
- btnCliente.setFont(new java.awt.Font("Segoe UI", 1, 36)); // NOI18N
+ btnCliente.setFont(new java.awt.Font("Segoe UI", 1, 31)); // NOI18N
btnCliente.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/simbolos/person_user_customer_man_male_man_boy_people_1687_64.png"))); // NOI18N
btnCliente.setText("Cliente");
+ btnCliente.setContentAreaFilled(false);
btnCliente.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnClienteActionPerformed(evt);
}
});
+<<<<<<< Updated upstream
jPanel1.add(btnCliente, new org.netbeans.lib.awtextra.AbsoluteConstraints(250, 410, 400, 130));
+=======
+ jPanel1.add(btnCliente, new org.netbeans.lib.awtextra.AbsoluteConstraints(100, 380, 400, 130));
+>>>>>>> Stashed changes
btnLogout.setFont(new java.awt.Font("Segoe UI", 1, 36)); // NOI18N
btnLogout.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/simbolos/logout_90894_64.png"))); // NOI18N
@@ -207,8 +355,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
lblLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/livro01.png"))); // NOI18N
jPanel1.add(lblLogo, new org.netbeans.lib.awtextra.AbsoluteConstraints(1490, 10, 390, 210));
+<<<<<<< Updated upstream
lblImagem.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/background_resize.jpg"))); // NOI18N
jPanel1.add(lblImagem, new org.netbeans.lib.awtextra.AbsoluteConstraints(0, 0, 1920, 1080));
+=======
+ lblImagem.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/Telas/Menu.png"))); // NOI18N
+ jPanel1.add(lblImagem, new org.netbeans.lib.awtextra.AbsoluteConstraints(0, -120, -1, 1290));
+ lblImagem.getAccessibleContext().setAccessibleName("");
+>>>>>>> Stashed changes
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
@@ -220,7 +374,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+<<<<<<< Updated upstream
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 1081, javax.swing.GroupLayout.PREFERRED_SIZE)
+=======
+ .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 1064, javax.swing.GroupLayout.PREFERRED_SIZE)
+>>>>>>> Stashed changes
);
pack();
@@ -232,6 +390,8 @@ private void btnLogoutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
user="";
verificarLogin(logado);
JOptionPane.showMessageDialog(null,"Você acabou de sair do sistema", "Mensagem",JOptionPane.PLAIN_MESSAGE);
+ atualizarBotoes();
+
}//GEN-LAST:event_btnLogoutActionPerformed
diff --git a/src/telas/areaCliente.form b/src/telas/areaCliente.form
index 9eeb4a5..32ea4b1 100644
--- a/src/telas/areaCliente.form
+++ b/src/telas/areaCliente.form
@@ -19,8 +19,10 @@
+
+<<<<<<< Updated upstream
@@ -57,118 +59,133 @@
+=======
+
+
+>>>>>>> Stashed changes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -184,31 +201,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -229,6 +264,9 @@
+
+
+
@@ -282,6 +320,9 @@
+
+
+
@@ -309,8 +350,17 @@
+
+
+
+
+
+
+
+
+<<<<<<< Updated upstream
@@ -324,14 +374,19 @@
+=======
+
+>>>>>>> Stashed changes
-
-
+
+
-
-
-
+
+
+
+
+
diff --git a/src/telas/areaCliente.java b/src/telas/areaCliente.java
index 2f21e46..4369092 100644
--- a/src/telas/areaCliente.java
+++ b/src/telas/areaCliente.java
@@ -25,6 +25,8 @@ public areaCliente() {
btnSalvarCliente.setEnabled(false);
btnCancelarCliente.setEnabled(false);
loadClienteFields();
+ this.setExtendedState(MAXIMIZED_BOTH);
+
}
@@ -106,24 +108,31 @@ private void initComponents() {
txtCPFCliente = new javax.swing.JFormattedTextField();
btnSairCliente = new javax.swing.JButton();
lblAreaCliente = new javax.swing.JLabel();
- jSeparator1 = new javax.swing.JSeparator();
+ jLabel1 = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("Área do cliente");
+ getContentPane().setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
lblDadosCliente.setFont(new java.awt.Font("Segoe UI", 1, 14)); // NOI18N
lblDadosCliente.setText("meus dados");
+ lblNomeCliente.setFont(new java.awt.Font("Old London", 0, 48)); // NOI18N
lblNomeCliente.setText("Nome");
+ lblCPFCliente.setFont(new java.awt.Font("Old London", 0, 48)); // NOI18N
lblCPFCliente.setText("CPF");
+ lblEmailCliente.setFont(new java.awt.Font("Old London", 0, 48)); // NOI18N
lblEmailCliente.setText("E-mail");
+ lblSenhaCliente.setFont(new java.awt.Font("Old London", 0, 48)); // NOI18N
lblSenhaCliente.setText("Senha");
+ lblEnderecoCliente.setFont(new java.awt.Font("Old London", 0, 48)); // NOI18N
lblEnderecoCliente.setText("Endereço");
+ lblNascimentoCliente.setFont(new java.awt.Font("Old London", 0, 48)); // NOI18N
lblNascimentoCliente.setText("data de nascimento");
txtNomeCliente.setToolTipText("Nome do cliente");
@@ -136,6 +145,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
txtEmailCliente.setToolTipText("email cadastrado");
txtSenhaCliente.setToolTipText("senha do cliente");
+ txtSenhaCliente.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ txtSenhaClienteActionPerformed(evt);
+ }
+ });
txtEnderecoCliente.setToolTipText("endereço salvo");
@@ -169,6 +183,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});
+ lblCelularCliente.setFont(new java.awt.Font("Old London", 0, 48)); // NOI18N
lblCelularCliente.setText("Celular");
try {
@@ -192,95 +207,109 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
txtCPFCliente.setToolTipText("CPF do cliente");
+ lblAreaCliente.setFont(new java.awt.Font("Old London", 1, 48)); // NOI18N
+ lblAreaCliente.setText("Área do Cliente");
+
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
+ .addGap(30, 30, 30)
+ .addComponent(btnAlterarCliente)
+ .addGap(136, 136, 136)
+ .addComponent(btnSalvarCliente)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 143, Short.MAX_VALUE)
+ .addComponent(btnCancelarCliente)
+ .addGap(45, 45, 45))
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(lblDadosCliente)
.addGroup(jPanel1Layout.createSequentialGroup()
- .addGap(3, 3, 3)
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addComponent(lblNomeCliente)
- .addGap(2, 2, 2)
- .addComponent(txtNomeCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 159, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addComponent(lblCPFCliente)
- .addGap(38, 38, 38)
- .addComponent(txtCPFCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 83, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(ftxNascimentoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 607, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(jPanel1Layout.createSequentialGroup()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addGap(211, 211, 211)
- .addComponent(lblNascimentoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 104, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(ftxNascimentoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 75, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addGap(20, 20, 20)
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(lblEmailCliente)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
- .addGap(3, 3, 3)
- .addComponent(lblSenhaCliente)))
- .addComponent(lblCelularCliente))
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addGap(18, 18, 18)
- .addComponent(txtEmailCliente, javax.swing.GroupLayout.DEFAULT_SIZE, 115, Short.MAX_VALUE))
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addGap(18, 18, 18)
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(ftxTelefone, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(txtSenhaCliente))))
- .addGap(37, 37, 37)
- .addComponent(lblEnderecoCliente)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(txtEnderecoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 107, javax.swing.GroupLayout.PREFERRED_SIZE)))))
- .addGap(45, 45, 45))
- .addGroup(jPanel1Layout.createSequentialGroup()
+ .addComponent(lblNascimentoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 342, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lblEmailCliente)
+ .addComponent(lblCelularCliente)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(txtEmailCliente, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 607, Short.MAX_VALUE)
+ .addComponent(lblSenhaCliente, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(txtSenhaCliente, javax.swing.GroupLayout.Alignment.LEADING)))
+ .addGap(0, 0, Short.MAX_VALUE))))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
.addContainerGap()
- .addComponent(btnAlterarCliente)
- .addGap(150, 150, 150)
- .addComponent(btnSalvarCliente)
+ .addComponent(lblDadosCliente)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(btnCancelarCliente)
- .addGap(63, 63, 63))
+ .addComponent(lblAreaCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 290, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(165, 165, 165))
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(txtNomeCliente)
+ .addComponent(lblNomeCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 126, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(txtEnderecoCliente)
+ .addComponent(lblEnderecoCliente))
+ .addContainerGap())
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(txtCPFCliente)
+ .addComponent(lblCPFCliente))
+ .addContainerGap())
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(ftxTelefone, javax.swing.GroupLayout.PREFERRED_SIZE, 607, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
- .addGap(26, 26, 26)
- .addComponent(lblDadosCliente)
- .addGap(18, 18, 18)
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(lblNomeCliente)
- .addComponent(txtNomeCliente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(lblEmailCliente)
- .addComponent(txtEmailCliente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(lblEnderecoCliente)
- .addComponent(txtEnderecoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(30, 30, 30)
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(lblCPFCliente)
- .addComponent(lblSenhaCliente)
- .addComponent(lblNascimentoCliente)
- .addComponent(txtSenhaCliente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(ftxNascimentoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(txtCPFCliente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(18, 18, 18)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(lblCelularCliente)
- .addComponent(ftxTelefone, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(25, 25, 25)
+ .addComponent(lblAreaCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lblDadosCliente))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(lblNomeCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(txtNomeCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 37, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(lblEnderecoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(txtEnderecoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(lblCPFCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(txtCPFCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(lblNascimentoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 53, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(ftxNascimentoCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(lblCelularCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(ftxTelefone, javax.swing.GroupLayout.PREFERRED_SIZE, 34, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(lblEmailCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(txtEmailCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(lblSenhaCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(txtSenhaCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(24, 24, 24)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(btnAlterarCliente)
.addComponent(btnSalvarCliente)
.addComponent(btnCancelarCliente))
- .addContainerGap(14, Short.MAX_VALUE))
+ .addGap(80, 80, 80))
);
+<<<<<<< Updated upstream
btnSairCliente.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/simbolos/exit_icon-icons.com_70975.png"))); // NOI18N
btnSairCliente.setText("Sair");
btnSairCliente.setToolTipText("Sair da área do cliente");
@@ -322,6 +351,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
+=======
+ getContentPane().add(jPanel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(790, 100, 628, 890));
+
+ jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/Telas/ÁreaCliente.png"))); // NOI18N
+ getContentPane().add(jLabel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(0, 0, -1, -1));
+>>>>>>> Stashed changes
pack();
}// //GEN-END:initComponents
@@ -351,6 +386,7 @@ private void btnCancelarClienteActionPerformed(java.awt.event.ActionEvent evt) {
btnAlterarCliente.setEnabled(true);
btnCancelarCliente.setEnabled(false);
btnSalvarCliente.setEnabled(false);
+ loadClienteFields();
}//GEN-LAST:event_btnCancelarClienteActionPerformed
private void btnSalvarClienteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSalvarClienteActionPerformed
@@ -361,6 +397,10 @@ private void btnSalvarClienteActionPerformed(java.awt.event.ActionEvent evt) {//
btnSalvarCliente.setEnabled(false);
}//GEN-LAST:event_btnSalvarClienteActionPerformed
+ private void txtSenhaClienteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtSenhaClienteActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_txtSenhaClienteActionPerformed
+
/**
* @param args the command line arguments
*/
@@ -403,8 +443,8 @@ public void run() {
private javax.swing.JButton btnSalvarCliente;
private javax.swing.JFormattedTextField ftxNascimentoCliente;
private javax.swing.JFormattedTextField ftxTelefone;
+ private javax.swing.JLabel jLabel1;
private javax.swing.JPanel jPanel1;
- private javax.swing.JSeparator jSeparator1;
private javax.swing.JLabel lblAreaCliente;
private javax.swing.JLabel lblCPFCliente;
private javax.swing.JLabel lblCelularCliente;
diff --git a/src/telas/areaFuncionario.form b/src/telas/areaFuncionario.form
index 9618935..e7c72c9 100644
--- a/src/telas/areaFuncionario.form
+++ b/src/telas/areaFuncionario.form
@@ -19,38 +19,232 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,7 +260,7 @@
-
+
@@ -85,13 +279,21 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -99,8 +301,9 @@
+
-
+
@@ -132,7 +335,7 @@
-
+
@@ -251,5 +454,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/telas/areaFuncionario.java b/src/telas/areaFuncionario.java
index 5157dd8..48a2ff0 100644
--- a/src/telas/areaFuncionario.java
+++ b/src/telas/areaFuncionario.java
@@ -4,8 +4,10 @@
*/
package telas;
+import static classes.Cliente.listaClientes;
import classes.Funcionario;
import static classes.Funcionario.listaFuncionarios;
+import javax.swing.table.DefaultTableModel;
//import static telas.cadastrarFuncionario.listaFuncionarios;
/**
@@ -25,6 +27,8 @@ public areaFuncionario() {
btnSalvarFuncionario.setEnabled(false);
btnCancelarFuncionario.setEnabled(false);
loadFuncionarioFields();
+ this.setExtendedState(MAXIMIZED_BOTH);
+
setLocationRelativeTo(null);
}
@@ -64,6 +68,31 @@ public void loadFuncionarioFields(){
txtSenhaFuncionario.setText(funcionario_dados.getSenha());
txtCodigoFuncionario.setText(funcionario_dados.getCadastroFuncionario());
}
+ private void carregarTabelaCliente(){
+ DefaultTableModel modeloTabelaCliente = new DefaultTableModel(new Object[] {"Cod.Cliente","Nome","CPF","Data Nascimento","Endereço"},0);
+
+ for(int i=0;i//GEN-BEGIN:initComponents
private void initComponents() {
+ jPanel3 = new javax.swing.JPanel();
+ lblControleClientes = new javax.swing.JLabel();
+ lblNomeCliente = new javax.swing.JLabel();
+ txtNomeCliente = new javax.swing.JTextField();
+ lblCPFCliente = new javax.swing.JLabel();
+ lblCodigoCliente = new javax.swing.JLabel();
+ txtCodCliente = new javax.swing.JTextField();
+ btnBuscarCliente = new javax.swing.JButton();
+ btnNovoCliente = new javax.swing.JButton();
+ btnSalvarCliente = new javax.swing.JButton();
+ btnExluirCliente = new javax.swing.JButton();
+ jScrollPane3 = new javax.swing.JScrollPane();
+ tblControleClientes = new javax.swing.JTable();
+ jFormattedTextField1 = new javax.swing.JFormattedTextField();
jPanel1 = new javax.swing.JPanel();
lblDadosFuncionario = new javax.swing.JLabel();
lblNomeFuncionario = new javax.swing.JLabel();
@@ -90,9 +133,150 @@ private void initComponents() {
btnCancelarFuncionario = new javax.swing.JButton();
btnSalvarFuncionario = new javax.swing.JButton();
lblAreaFuncionario = new javax.swing.JLabel();
+ jLabel1 = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("Área do funcionário");
+ getContentPane().setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
+
+ jPanel3.setBackground(new java.awt.Color(211, 181, 143));
+
+ lblControleClientes.setFont(new java.awt.Font("Old English Text MT", 1, 36)); // NOI18N
+ lblControleClientes.setText("Controle de Clientes");
+
+ lblNomeCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ lblNomeCliente.setText("Nome");
+
+ lblCPFCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ lblCPFCliente.setText("CPF");
+
+ lblCodigoCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ lblCodigoCliente.setText("Código de Cliente");
+
+ btnBuscarCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ btnBuscarCliente.setText("Buscar");
+
+ btnNovoCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ btnNovoCliente.setText("Novo");
+ btnNovoCliente.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnNovoClienteActionPerformed(evt);
+ }
+ });
+
+ btnSalvarCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ btnSalvarCliente.setText("Salvar");
+ btnSalvarCliente.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnSalvarClienteActionPerformed(evt);
+ }
+ });
+
+ btnExluirCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ btnExluirCliente.setText("Excluir");
+ btnExluirCliente.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnExluirClienteActionPerformed(evt);
+ }
+ });
+
+ tblControleClientes.setModel(new javax.swing.table.DefaultTableModel(
+ new Object [][] {
+ {null, null, null, null, null},
+ {null, null, null, null, null},
+ {null, null, null, null, null},
+ {null, null, null, null, null}
+ },
+ new String [] {
+ "Código Cliente", "Nome", "CPF", "Data Nascimento", "Endereço"
+ }
+ ) {
+ Class[] types = new Class [] {
+ java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class
+ };
+
+ public Class getColumnClass(int columnIndex) {
+ return types [columnIndex];
+ }
+ });
+ jScrollPane3.setViewportView(tblControleClientes);
+
+ try {
+ jFormattedTextField1.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.MaskFormatter("###.###.###-##")));
+ } catch (java.text.ParseException ex) {
+ ex.printStackTrace();
+ }
+
+ javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
+ jPanel3.setLayout(jPanel3Layout);
+ jPanel3Layout.setHorizontalGroup(
+ jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel3Layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(lblCPFCliente)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jFormattedTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 115, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(btnBuscarCliente))
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel3Layout.createSequentialGroup()
+ .addGap(159, 159, 159)
+ .addComponent(lblControleClientes)))
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addComponent(lblNomeCliente)
+ .addGap(18, 18, 18)
+ .addComponent(txtNomeCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 149, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addComponent(lblCodigoCliente)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(txtCodCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 173, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addComponent(btnNovoCliente)
+ .addGap(83, 83, 83)
+ .addComponent(btnSalvarCliente)
+ .addGap(103, 103, 103)
+ .addComponent(btnExluirCliente)))))
+ .addContainerGap(77, Short.MAX_VALUE))
+ .addComponent(jScrollPane3)
+ );
+ jPanel3Layout.setVerticalGroup(
+ jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(lblControleClientes)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(lblNomeCliente)
+ .addComponent(txtNomeCliente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addGap(51, 51, 51)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(lblCPFCliente)
+ .addComponent(jFormattedTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addGap(40, 40, 40)
+ .addComponent(btnBuscarCliente)))
+ .addGap(42, 42, 42)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(lblCodigoCliente)
+ .addComponent(txtCodCliente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(18, 18, 18)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(btnNovoCliente)
+ .addComponent(btnSalvarCliente)
+ .addComponent(btnExluirCliente))
+ .addGap(80, 80, 80)
+ .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 187, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(182, Short.MAX_VALUE))
+ );
+
+ getContentPane().add(jPanel3, new org.netbeans.lib.awtextra.AbsoluteConstraints(830, 210, 550, 700));
lblDadosFuncionario.setFont(new java.awt.Font("Segoe UI", 1, 14)); // NOI18N
lblDadosFuncionario.setText("meus dados");
@@ -154,10 +338,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addGap(267, 267, 267)
- .addComponent(lblAreaFuncionario)
- .addGap(0, 0, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -170,7 +350,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(lblEmailFuncionario)
.addComponent(lblSenhaFuncionario)
.addComponent(lblCodFuncionario))))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 24, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -184,19 +364,25 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(txtCodigoFuncionario, javax.swing.GroupLayout.PREFERRED_SIZE, 185, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
.addGroup(jPanel1Layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(btnAlterarFuncionario)
- .addGap(168, 168, 168)
- .addComponent(btnSalvarFuncionario)
- .addGap(129, 129, 129)
- .addComponent(btnCancelarFuncionario)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(btnAlterarFuncionario)
+ .addGap(133, 133, 133)
+ .addComponent(btnSalvarFuncionario)
+ .addGap(101, 101, 101)
+ .addComponent(btnCancelarFuncionario))
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addGap(172, 172, 172)
+ .addComponent(lblAreaFuncionario)))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
+ .addGap(8, 8, 8)
.addComponent(lblAreaFuncionario)
- .addGap(26, 26, 26)
+ .addGap(18, 18, 18)
.addComponent(lblDadosFuncionario)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblNomeFuncionario)
@@ -222,24 +408,13 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(btnAlterarFuncionario)
.addComponent(btnSalvarFuncionario)
.addComponent(btnCancelarFuncionario))
- .addContainerGap(44, Short.MAX_VALUE))
+ .addContainerGap(96, Short.MAX_VALUE))
);
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
- getContentPane().setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap(45, Short.MAX_VALUE)
- .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- );
+ getContentPane().add(jPanel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(120, 180, 520, 370));
+
+ jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/Telas/ÁreaFuncionário.png"))); // NOI18N
+ getContentPane().add(jLabel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(0, 0, -1, -1));
pack();
}// //GEN-END:initComponents
@@ -258,7 +433,7 @@ private void btnCancelarFuncionarioActionPerformed(java.awt.event.ActionEvent ev
btnAlterarFuncionario.setEnabled(true);
btnSalvarFuncionario.setEnabled(false);
btnCancelarFuncionario.setEnabled(false);
-
+ loadFuncionarioFields();
}//GEN-LAST:event_btnCancelarFuncionarioActionPerformed
@@ -270,6 +445,30 @@ private void btnSalvarFuncionarioActionPerformed(java.awt.event.ActionEvent evt)
btnCancelarFuncionario.setEnabled(false);
}//GEN-LAST:event_btnSalvarFuncionarioActionPerformed
+ private void btnNovoClienteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnNovoClienteActionPerformed
+ // TODO add your handling code here:
+ new cadastrarCliente().setVisible(true);
+ btnExluirCliente.setEnabled(false);
+ btnSalvarCliente.setEnabled(true);
+ }//GEN-LAST:event_btnNovoClienteActionPerformed
+
+ private void btnSalvarClienteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSalvarClienteActionPerformed
+ // TODO add your handling code here:
+ carregarTabelaCliente();
+ }//GEN-LAST:event_btnSalvarClienteActionPerformed
+
+ private void btnExluirClienteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnExluirClienteActionPerformed
+ // TODO add your handling code here:
+
+ int i = tblControleClientes.getSelectedRow();
+
+ if(i>=0 && i
-
+
@@ -149,7 +149,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -314,7 +318,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -550,7 +558,11 @@
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
@@ -666,6 +678,9 @@
+
+
+
@@ -676,13 +691,16 @@
+
+
+
-
+
diff --git a/src/telas/areaGerente.java b/src/telas/areaGerente.java
index 7877159..6a4e66a 100644
--- a/src/telas/areaGerente.java
+++ b/src/telas/areaGerente.java
@@ -27,7 +27,8 @@ public areaGerente() {
btnCancelarGerente.setEnabled(false);
btnSalvarGerente.setEnabled(false);
btnAlterarGerente.setEnabled(true);
-
+ btnBuscarFuncionario.setEnabled(true);
+
btnNovoFuncionario.setEnabled(true);
//btnPesquisarFuncionario.setEnabled(true);
loadGerenteInfo();
@@ -253,7 +254,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(ftxCPFGerente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(lblEmailGerente)
+<<<<<<< Updated upstream
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+=======
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 41, Short.MAX_VALUE)
+>>>>>>> Stashed changes
.addComponent(txtEmailGerente, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(9, 9, 9)
.addComponent(lblSenhaGerente)
@@ -271,7 +276,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGap(102, 102, 102))
);
- getContentPane().add(jPanel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(90, 280, 530, 670));
+ getContentPane().add(jPanel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(40, 210, 530, 700));
jPanel2.setBackground(new java.awt.Color(211, 181, 143));
@@ -415,7 +420,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addContainerGap())
);
+<<<<<<< Updated upstream
getContentPane().add(jPanel2, new org.netbeans.lib.awtextra.AbsoluteConstraints(910, 220, 870, 430));
+=======
+ getContentPane().add(jPanel2, new org.netbeans.lib.awtextra.AbsoluteConstraints(900, 40, 870, 380));
+>>>>>>> Stashed changes
jPanel3.setBackground(new java.awt.Color(211, 181, 143));
@@ -434,11 +443,65 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
jButton1.setText("Buscar");
+<<<<<<< Updated upstream
jButton2.setText("Novo");
+=======
+ btnNovoCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ btnNovoCliente.setText("Novo");
+ btnNovoCliente.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnNovoClienteActionPerformed(evt);
+ }
+ });
+>>>>>>> Stashed changes
jButton3.setText("Salvar");
+<<<<<<< Updated upstream
jButton4.setText("Excluir");
+=======
+ btnExluirCliente.setFont(new java.awt.Font("Old English Text MT", 0, 18)); // NOI18N
+ btnExluirCliente.setText("Excluir");
+ btnExluirCliente.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnExluirClienteActionPerformed(evt);
+ }
+ });
+
+ tblControleClientes.setModel(new javax.swing.table.DefaultTableModel(
+ new Object [][] {
+ {null, null, null, null, null},
+ {null, null, null, null, null},
+ {null, null, null, null, null},
+ {null, null, null, null, null}
+ },
+ new String [] {
+ "Código Cliente", "Nome", "CPF", "Data Nascimento", "Endereço"
+ }
+ ) {
+ Class[] types = new Class [] {
+ java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class
+ };
+
+ public Class getColumnClass(int columnIndex) {
+ return types [columnIndex];
+ }
+ });
+ jScrollPane3.setViewportView(tblControleClientes);
+ if (tblControleClientes.getColumnModel().getColumnCount() > 0) {
+ tblControleClientes.getColumnModel().getColumn(0).setPreferredWidth(3);
+ tblControleClientes.getColumnModel().getColumn(1).setPreferredWidth(50);
+ tblControleClientes.getColumnModel().getColumn(2).setPreferredWidth(14);
+ tblControleClientes.getColumnModel().getColumn(3).setPreferredWidth(10);
+ tblControleClientes.getColumnModel().getColumn(4).setPreferredWidth(100);
+ }
+
+ try {
+ jFormattedTextField1.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.MaskFormatter("###.###.###-##")));
+ } catch (java.text.ParseException ex) {
+ ex.printStackTrace();
+ }
+>>>>>>> Stashed changes
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
@@ -494,10 +557,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGap(0, 293, Short.MAX_VALUE))
);
+<<<<<<< Updated upstream
getContentPane().add(jPanel3, new org.netbeans.lib.awtextra.AbsoluteConstraints(850, 670, 940, 390));
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/ÁreaGerente.png"))); // NOI18N
getContentPane().add(jLabel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(0, -30, 1920, 1140));
+=======
+ getContentPane().add(jPanel3, new org.netbeans.lib.awtextra.AbsoluteConstraints(830, 530, 940, 390));
+
+ lblBackground.setIcon(new javax.swing.ImageIcon(getClass().getResource("/imagens/Telas/ÁreaGerente.png"))); // NOI18N
+ getContentPane().add(lblBackground, new org.netbeans.lib.awtextra.AbsoluteConstraints(0, -30, 1920, 1140));
+>>>>>>> Stashed changes
pack();
}// //GEN-END:initComponents
@@ -551,6 +621,33 @@ private void txtCodigoFuncionarioActionPerformed(java.awt.event.ActionEvent evt)
// TODO add your handling code here:
}//GEN-LAST:event_txtCodigoFuncionarioActionPerformed
+<<<<<<< Updated upstream
+=======
+ private void btnSalvarClienteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSalvarClienteActionPerformed
+ // TODO add your handling code here:
+ carregarTabelaCliente();
+ }//GEN-LAST:event_btnSalvarClienteActionPerformed
+
+ private void btnExluirClienteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnExluirClienteActionPerformed
+ // TODO add your handling code here:
+
+ int i = tblControleClientes.getSelectedRow();
+
+ if(i>=0 && i>>>>>> Stashed changes
/**
* @param args the command line arguments
*/
diff --git a/src/telas/carrinhosAntigos.form b/src/telas/carrinhosAntigos.form
index 4658861..2ce7216 100644
--- a/src/telas/carrinhosAntigos.form
+++ b/src/telas/carrinhosAntigos.form
@@ -1,6 +1,6 @@
-