From d6f61a3c41768cfddf7cedb9d7de9483ee1fbe8c Mon Sep 17 00:00:00 2001 From: izaquiel7 Date: Thu, 30 Aug 2018 15:45:16 -0300 Subject: [PATCH] telas para visualizar, alterar e cadastrar servico --- src/main/webapp/Cliente/agendarServico.xhtml | 9 +- .../webapp/Cliente/meusAgendamentos.xhtml | 2 +- .../webapp/Cliente/visualizarServicos.xhtml | 4 + .../alteraCadastroServico.xhtml} | 132 +++++++-------- .../Empresa/alterarCadastroEmpresa.xhtml | 118 ++++++++++++++ .../webapp/Empresa/cadastrarEmpresa.xhtml | 118 ++++++++++++++ .../cadastroServico.xhtml} | 150 +++++++++--------- src/main/webapp/Empresa/meusServicos.xhtml | 64 ++++++++ src/main/webapp/index.xhtml | 5 +- .../webapp/templates/templateCliente.xhtml | 4 +- .../webapp/templates/templateEmpresa.xhtml | 4 +- src/main/webapp/visualizarServicos.xhtml | 44 +++-- 12 files changed, 474 insertions(+), 180 deletions(-) rename src/main/webapp/{Servico/alteraCadastro.xhtml => Empresa/alteraCadastroServico.xhtml} (95%) create mode 100644 src/main/webapp/Empresa/alterarCadastroEmpresa.xhtml create mode 100644 src/main/webapp/Empresa/cadastrarEmpresa.xhtml rename src/main/webapp/{Servico/cadastro.xhtml => Empresa/cadastroServico.xhtml} (84%) create mode 100644 src/main/webapp/Empresa/meusServicos.xhtml diff --git a/src/main/webapp/Cliente/agendarServico.xhtml b/src/main/webapp/Cliente/agendarServico.xhtml index 391761f..ff31345 100644 --- a/src/main/webapp/Cliente/agendarServico.xhtml +++ b/src/main/webapp/Cliente/agendarServico.xhtml @@ -65,13 +65,10 @@ - + - - - - + + diff --git a/src/main/webapp/Cliente/meusAgendamentos.xhtml b/src/main/webapp/Cliente/meusAgendamentos.xhtml index 738bf99..64fa491 100644 --- a/src/main/webapp/Cliente/meusAgendamentos.xhtml +++ b/src/main/webapp/Cliente/meusAgendamentos.xhtml @@ -13,7 +13,7 @@ - + diff --git a/src/main/webapp/Cliente/visualizarServicos.xhtml b/src/main/webapp/Cliente/visualizarServicos.xhtml index 0d98c18..07b240a 100644 --- a/src/main/webapp/Cliente/visualizarServicos.xhtml +++ b/src/main/webapp/Cliente/visualizarServicos.xhtml @@ -29,6 +29,10 @@
+ + + +
- - - - Petpalacy - - - - - - - - - - - - - - - - -
-
- -

DADOS DO SERVIÇO

- - - - - - - - - - - - - - - -
- - - -
- - - - - - - -
-
-
-
-
- - + + + + + Petpalacy + + + + + + + + + + + + + + + + +
+
+ +

DADOS DO SERVIÇO

+ + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + +
+
+
+
+
+ + diff --git a/src/main/webapp/Empresa/alterarCadastroEmpresa.xhtml b/src/main/webapp/Empresa/alterarCadastroEmpresa.xhtml new file mode 100644 index 0000000..6eb081d --- /dev/null +++ b/src/main/webapp/Empresa/alterarCadastroEmpresa.xhtml @@ -0,0 +1,118 @@ + + + + + Petpalacy + + + + + + + + + + + + + + + + +
+
+ +

Dados pessoais

+ + + + + + + + + + + + + + + + + + + + + + + +

Dados de endereço

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + +
+
+
+
+
+ + diff --git a/src/main/webapp/Empresa/cadastrarEmpresa.xhtml b/src/main/webapp/Empresa/cadastrarEmpresa.xhtml new file mode 100644 index 0000000..231454c --- /dev/null +++ b/src/main/webapp/Empresa/cadastrarEmpresa.xhtml @@ -0,0 +1,118 @@ + + + + + Petpalacy + + + + + + + + + + + + + + + + +
+
+ +

Dados pessoais

+ + + + + + + + + + + + + + + + + + + + + + + +

Dados de endereço

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + +
+
+
+
+
+ + diff --git a/src/main/webapp/Servico/cadastro.xhtml b/src/main/webapp/Empresa/cadastroServico.xhtml similarity index 84% rename from src/main/webapp/Servico/cadastro.xhtml rename to src/main/webapp/Empresa/cadastroServico.xhtml index 0a5eee6..ee0fdd6 100644 --- a/src/main/webapp/Servico/cadastro.xhtml +++ b/src/main/webapp/Empresa/cadastroServico.xhtml @@ -1,75 +1,75 @@ - - - - - Petpalacy - - - - - - - - - - - - - - - - - - - - - -
-
- -

Dados dos serviços

- - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - -
-
-
-
-
- - + + + + + Petpalacy + + + + + + + + + + + + + + + + + + + + + +
+
+ +

Dados dos serviços

+ + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + +
+ +
+
+
+
+ + diff --git a/src/main/webapp/Empresa/meusServicos.xhtml b/src/main/webapp/Empresa/meusServicos.xhtml new file mode 100644 index 0000000..b1329c2 --- /dev/null +++ b/src/main/webapp/Empresa/meusServicos.xhtml @@ -0,0 +1,64 @@ + + + + + Petpalacy + + + + + + + + + + + + + + + + + + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml index 7d984e9..85463aa 100644 --- a/src/main/webapp/index.xhtml +++ b/src/main/webapp/index.xhtml @@ -60,7 +60,7 @@ - + @@ -78,8 +78,7 @@
diff --git a/src/main/webapp/templates/templateCliente.xhtml b/src/main/webapp/templates/templateCliente.xhtml index 8510eb1..ad8e132 100644 --- a/src/main/webapp/templates/templateCliente.xhtml +++ b/src/main/webapp/templates/templateCliente.xhtml @@ -25,8 +25,8 @@
  • Pagína Inicial
  • - - + +
  • Sobre Petpalacy
  • diff --git a/src/main/webapp/templates/templateEmpresa.xhtml b/src/main/webapp/templates/templateEmpresa.xhtml index 9dba8de..0d94067 100644 --- a/src/main/webapp/templates/templateEmpresa.xhtml +++ b/src/main/webapp/templates/templateEmpresa.xhtml @@ -25,9 +25,7 @@
    • Pagína Inicial
    • - - -
    +
  • Sobre Petpalacy
  • diff --git a/src/main/webapp/visualizarServicos.xhtml b/src/main/webapp/visualizarServicos.xhtml index 6c56bb9..7b3523e 100644 --- a/src/main/webapp/visualizarServicos.xhtml +++ b/src/main/webapp/visualizarServicos.xhtml @@ -28,35 +28,31 @@
    - - - - - +
    - - - - - - - - - + var="servico" id="proTable" + rowKey="#{servico.idServico}" style="width:700px"> + + + + + + + + - - + + - - - - + + + + - - + +