Skip to content

Commit c6646b9

Browse files
mateusmateus
committed
Adicionado: Placeholders para Datas e feito o primeiro relatório
1 parent d857588 commit c6646b9

24 files changed

+373
-33
lines changed

‎build/generated-sources/ap-source-output/com/model/AgendaPK_.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.model;
2+
3+
import java.util.Date;
4+
import javax.annotation.Generated;
5+
import javax.persistence.metamodel.SingularAttribute;
6+
import javax.persistence.metamodel.StaticMetamodel;
7+
8+
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-27T22:52:21")
9+
@StaticMetamodel(AgendaPK.class)
10+
public class AgendaPK_ {
11+
12+
public static volatile SingularAttribute<AgendaPK, Integer> idPaciente;
13+
public static volatile SingularAttribute<AgendaPK, Integer> idExame;
14+
public static volatile SingularAttribute<AgendaPK, Date> dataHora;
15+
public static volatile SingularAttribute<AgendaPK, Integer> idMedico;
16+
17+
}

‎build/generated-sources/ap-source-output/com/model/Agenda_.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.model;
2+
3+
import com.model.AgendaPK;
4+
import com.model.Exame;
5+
import com.model.Medico;
6+
import com.model.Paciente;
7+
import javax.annotation.Generated;
8+
import javax.persistence.metamodel.SingularAttribute;
9+
import javax.persistence.metamodel.StaticMetamodel;
10+
11+
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-27T22:52:21")
12+
@StaticMetamodel(Agenda.class)
13+
public class Agenda_ {
14+
15+
public static volatile SingularAttribute<Agenda, String> obs;
16+
public static volatile SingularAttribute<Agenda, Paciente> paciente;
17+
public static volatile SingularAttribute<Agenda, Medico> medico;
18+
public static volatile SingularAttribute<Agenda, String> resultado;
19+
public static volatile SingularAttribute<Agenda, AgendaPK> agendaPK;
20+
public static volatile SingularAttribute<Agenda, Exame> exame;
21+
22+
}

‎build/generated-sources/ap-source-output/com/model/Exame_.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
package com.model;
22

3+
import com.model.Agenda;
34
import javax.annotation.Generated;
5+
import javax.persistence.metamodel.CollectionAttribute;
46
import javax.persistence.metamodel.SingularAttribute;
57
import javax.persistence.metamodel.StaticMetamodel;
68

7-
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-24T02:38:51")
9+
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-27T22:52:21")
810
@StaticMetamodel(Exame.class)
911
public class Exame_ {
1012

11-
public static volatile SingularAttribute<Exame, Integer> id;
13+
public static volatile SingularAttribute<Exame, Integer> idExame;
1214
public static volatile SingularAttribute<Exame, Float> valor;
15+
public static volatile CollectionAttribute<Exame, Agenda> agendaCollection;
1316
public static volatile SingularAttribute<Exame, String> nome;
1417

1518
}

‎build/generated-sources/ap-source-output/com/model/Medico_.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
package com.model;
22

3+
import com.model.Agenda;
34
import javax.annotation.Generated;
5+
import javax.persistence.metamodel.CollectionAttribute;
46
import javax.persistence.metamodel.SingularAttribute;
57
import javax.persistence.metamodel.StaticMetamodel;
68

7-
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-24T02:38:51")
9+
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-27T22:52:21")
810
@StaticMetamodel(Medico.class)
911
public class Medico_ {
1012

11-
public static volatile SingularAttribute<Medico, Integer> id;
1213
public static volatile SingularAttribute<Medico, String> crm;
14+
public static volatile CollectionAttribute<Medico, Agenda> agendaCollection;
1315
public static volatile SingularAttribute<Medico, String> nome;
16+
public static volatile SingularAttribute<Medico, Integer> idMedico;
1417

1518
}

‎build/generated-sources/ap-source-output/com/model/Paciente_.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
package com.model;
22

3+
import com.model.Agenda;
34
import java.util.Date;
45
import javax.annotation.Generated;
6+
import javax.persistence.metamodel.CollectionAttribute;
57
import javax.persistence.metamodel.SingularAttribute;
68
import javax.persistence.metamodel.StaticMetamodel;
79

8-
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-24T02:38:51")
10+
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-27T22:52:21")
911
@StaticMetamodel(Paciente.class)
1012
public class Paciente_ {
1113

12-
public static volatile SingularAttribute<Paciente, Integer> id;
14+
public static volatile SingularAttribute<Paciente, Integer> idPaciente;
1315
public static volatile SingularAttribute<Paciente, String> bairro;
1416
public static volatile SingularAttribute<Paciente, String> cidade;
1517
public static volatile SingularAttribute<Paciente, Date> dataNasc;
1618
public static volatile SingularAttribute<Paciente, String> uf;
1719
public static volatile SingularAttribute<Paciente, String> logradouro;
20+
public static volatile CollectionAttribute<Paciente, Agenda> agendaCollection;
1821
public static volatile SingularAttribute<Paciente, String> nome;
1922
public static volatile SingularAttribute<Paciente, String> numero;
2023

‎build/generated-sources/ap-source-output/com/model/Usuario_.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import javax.persistence.metamodel.SingularAttribute;
55
import javax.persistence.metamodel.StaticMetamodel;
66

7-
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-24T02:38:51")
7+
@Generated(value="EclipseLink-2.3.2.v20111125-r10461", date="2013-02-27T22:52:21")
88
@StaticMetamodel(Usuario.class)
99
public class Usuario_ {
1010

‎build/web/WEB-INF/classes/com/model/Agenda.rapt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com/model/Agenda_.java

‎build/web/WEB-INF/classes/com/model/AgendaPK.rapt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com/model/AgendaPK_.java

‎build/web/WEB-INF/faces-config.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@
5555
<from-outcome>Inicio</from-outcome>
5656
<to-view-id>/index.xhtml</to-view-id>
5757
</navigation-case>
58-
<navigation-case>
59-
<from-outcome>cad_pac</from-outcome>
60-
<to-view-id>/cad_pac.xhtml</to-view-id>
61-
</navigation-case>
6258
</navigation-rule>
6359
<navigation-rule>
6460
<from-view-id>/lista_pac.xhtml</from-view-id>
@@ -81,4 +77,11 @@
8177
<to-view-id>/altera_exa.xhtml</to-view-id>
8278
</navigation-case>
8379
</navigation-rule>
80+
<navigation-rule>
81+
<from-view-id>/relatorios.xhtml</from-view-id>
82+
<navigation-case>
83+
<from-outcome>pesquisar</from-outcome>
84+
<to-view-id>/relatorios_resultado.xhtml</to-view-id>
85+
</navigation-case>
86+
</navigation-rule>
8487
</faces-config>

‎build/web/agendar.xhtml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@
1313
<h:outputStylesheet name="bootstrap-responsive.css" library="css" />
1414
<h:outputStylesheet name="my-style.css" library="css" />
1515
<link href="resources/img/favicon.gif" type="image/png" rel="icon" />
16+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
17+
<script type="text/javascript">
18+
function add_atributo_form(formulario, elemento, atributo, valor){
19+
var campo = $("#" + formulario + "\\:" + elemento);
20+
campo.attr(atributo, valor);
21+
}
22+
$(document).ready(function() {
23+
add_atributo_form("agendar-form", "dataHora", "placeholder", "dd/MM/aaaa HH:mm");
24+
});
25+
</script>
1626
</h:head>
1727
<body>
1828
<ui:include src="navbar.xhtml" />

‎build/web/altera_pac.xhtml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@
1313
<h:outputStylesheet name="bootstrap-responsive.css" library="css" />
1414
<h:outputStylesheet name="my-style.css" library="css" />
1515
<link href="resources/img/favicon.gif" type="image/png" rel="icon" />
16+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
17+
<script type="text/javascript">
18+
function add_atributo_form(formulario, elemento, atributo, valor){
19+
var campo = $("#" + formulario + "\\:" + elemento);
20+
campo.attr(atributo, valor);
21+
}
22+
$(document).ready(function() {
23+
add_atributo_form("cad-pac-form", "dataNasc", "placeholder", "dd/MM/aaaa");
24+
});
25+
</script>
1626
</h:head>
1727
<body>
1828
<ui:include src="navbar.xhtml" />

‎build/web/cad_pac.xhtml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@
1313
<h:outputStylesheet name="bootstrap-responsive.css" library="css" />
1414
<h:outputStylesheet name="my-style.css" library="css" />
1515
<link href="resources/img/favicon.gif" type="image/png" rel="icon" />
16+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
17+
<script type="text/javascript">
18+
function add_atributo_form(formulario, elemento, atributo, valor){
19+
var campo = $("#" + formulario + "\\:" + elemento);
20+
campo.attr(atributo, valor);
21+
}
22+
$(document).ready(function() {
23+
add_atributo_form("cad-pac-form", "dataNasc", "placeholder", "dd/MM/aaaa");
24+
});
25+
</script>
1626
</h:head>
1727
<body>
1828
<ui:include src="navbar.xhtml" />

‎build/web/relatorios.xhtml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@
1313
<h:outputStylesheet name="bootstrap-responsive.css" library="css" />
1414
<h:outputStylesheet name="my-style.css" library="css" />
1515
<link href="resources/img/favicon.gif" type="image/png" rel="icon" />
16+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
17+
<script type="text/javascript">
18+
function add_atributo_form(formulario, elemento, atributo, valor){
19+
var campo = $("#" + formulario + "\\:" + elemento);
20+
campo.attr(atributo, valor);
21+
}
22+
$(document).ready(function() {
23+
add_atributo_form("relatorio-form", "data-inicial", "placeholder", "dd/MM/aaaa HH:mm");
24+
add_atributo_form("relatorio-form", "data-final", "placeholder", "dd/MM/aaaa HH:mm");
25+
26+
});
27+
</script>
1628
</h:head>
1729
<body>
1830
<ui:include src="navbar.xhtml" />
@@ -29,11 +41,11 @@
2941
<legend>Período</legend>
3042
<label for="relatorio-form:data-inicial"><span style="color: red;">*</span> Data inicial</label>
3143
<h:inputText value="#{Relatorio.dataInicial}" id="data-inicial" style="width:150px" >
32-
<f:convertDateTime pattern="yyyy-MM-dd" />
44+
3345
</h:inputText>
3446
<label for="relatorio-form:data-final"><span style="color: red;">*</span> Data final</label>
3547
<h:inputText value="#{Relatorio.dataFinal}" id="data-final" style="width:150px" >
36-
<f:convertDateTime pattern="yyyy-MM-dd" />
48+
3749
</h:inputText>
3850

3951
<label></label>
@@ -42,7 +54,7 @@
4254
</fieldset>
4355
<label style="padding-top: 10px;"><span style="color: red;">*</span> Campos obrigatórios</label>
4456
<center>
45-
<h:commandButton style="margin-top: 15px;" class="btn btn-primary" action="#{Relatorio.pesquisar()}" value="Pesquisar"/>
57+
<h:commandButton style="margin-top: 15px;" class="btn btn-primary" action="#{Relatorio.redirecionar(Relatorio.dataInicial, Relatorio.dataFinal, Relatorio.faturamento)}" value="Pesquisar"/>
4658
<h:messages for="relatorio-form" styleClass="alert alert-info pull-right" style="margin-top: 15px; list-style: none; margin-right: 58px; padding-right: 15px;"/>
4759
</center>
4860
</h:form>

‎build/web/relatorios_resultado.xhtml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<!DOCTYPE html>
2+
<html xmlns="http://www.w3.org/1999/xhtml"
3+
xmlns:h="http://java.sun.com/jsf/html"
4+
xmlns:ui="http://java.sun.com/jsf/facelets"
5+
xmlns:f="http://java.sun.com/jsf/core">
6+
<h:head>
7+
<meta charset="utf-8" />
8+
<title>SAEC</title>
9+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
10+
<meta name="author" content="Mateus Ferreira Silva" />
11+
12+
<h:outputStylesheet name="bootstrap.css" library="css" />
13+
<h:outputStylesheet name="bootstrap-responsive.css" library="css" />
14+
<h:outputStylesheet name="my-style.css" library="css" />
15+
<link href="resources/img/favicon.gif" type="image/png" rel="icon" />
16+
</h:head>
17+
<body>
18+
<ui:include src="navbar.xhtml" />
19+
20+
<div class="container">
21+
<div class="row-fluid">
22+
<div class="span8 offset2">
23+
<div class="hero-unit">
24+
<h2>Relatório</h2>
25+
</div>
26+
<div class="span8 offset2">
27+
<h:form name="relatorios-resultado">
28+
<h:dataTable class="table table-condensed table-hover" value="#{Relatorio.pesquisar()}" var="rel" >
29+
30+
<h:column>
31+
<f:facet name="header">
32+
<h:outputText value="ID Exame"/>
33+
</f:facet>
34+
<h:outputText value="#{rel.agenda.agendaPK.idExame}"/>
35+
</h:column>
36+
37+
<h:column>
38+
<f:facet name="header">
39+
<h:outputText value="Exame"/>
40+
</f:facet>
41+
<h:outputText value="#{Exame.buscaExame(rel.agenda.agendaPK.idExame).nome}"/>
42+
</h:column>
43+
44+
<h:column>
45+
<f:facet name="header">
46+
<h:outputText value="Data"/>
47+
</f:facet>
48+
<h:outputText value="#{rel.agenda.agendaPK.dataHora}"/>
49+
</h:column>
50+
51+
<h:column>
52+
<f:facet name="header">
53+
<h:outputText value="Paciente"/>
54+
</f:facet>
55+
<h:outputText value="#{Paciente.buscaPaciente(rel.agenda.agendaPK.idPaciente).nome}"/>
56+
</h:column>
57+
58+
</h:dataTable>
59+
</h:form>
60+
</div>
61+
</div>
62+
</div>
63+
</div>
64+
65+
<ui:include src="footer.xhtml" />
66+
67+
<script src="resources/js/jquery.js"></script>
68+
<script src="resources/js/bootstrap-transition.js"></script>
69+
<script src="resources/js/bootstrap-alert.js"></script>
70+
<script src="resources/js/bootstrap-modal.js"></script>
71+
<script src="resources/js/bootstrap-dropdown.js"></script>
72+
<script src="resources/js/bootstrap-scrollspy.js"></script>
73+
<script src="resources/js/bootstrap-tab.js"></script>
74+
<script src="resources/js/bootstrap-tooltip.js"></script>
75+
<script src="resources/js/bootstrap-popover.js"></script>
76+
<script src="resources/js/bootstrap-button.js"></script>
77+
<script src="resources/js/bootstrap-collapse.js"></script>
78+
<script src="resources/js/bootstrap-carousel.js"></script>
79+
<script src="resources/js/bootstrap-typeahead.js"></script>
80+
81+
</body>
82+
</html>

‎especificacao/.~lock.Trabalho Final Java.docx#

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
,mateus,mateus-pc,27.02.2013 19:34,file:///home/mateus/.config/libreoffice/3;
1+
,mateus,mateus-pc,27.02.2013 23:31,file:///home/mateus/.config/libreoffice/3;

‎nbproject/faces-config.NavData

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
<Scene Scope="Project" version="2">
33
<Scope Scope="Faces Configuration Only"/>
44
<Scope Scope="Project">
5+
<Node id="relatorios_resultado.xhtml" x="243" y="227" zoom="true"/>
56
<Node id="agendar.xhtml" x="710" y="15" zoom="true"/>
67
<Node id="footer.xhtml" x="29" y="24" zoom="true"/>
78
<Node id="login.xhtml" x="37" y="539" zoom="true"/>
9+
<Node id="relatorios.xhtml" x="279" y="339" zoom="true"/>
810
<Node id="head.xhtml" x="443" y="18" zoom="true"/>
911
<Node id="consultas_age.xhtml" x="400" y="150" zoom="true"/>
1012
<Node id="cad_exa.xhtml" x="222" y="97" zoom="true"/>
1113
<Node id="altera_pac.xhtml" x="294" y="403" zoom="true"/>
1214
<Node id="navbar.xhtml" x="236" y="25" zoom="true"/>
13-
<Node id="cad_pac.xhtml" x="25" y="181" zoom="true"/>
14-
<Node id="altera_exa.xhtml" x="574" y="409" zoom="true"/>
15+
<Node id="cad_pac.xhtml" x="5" y="85" zoom="true"/>
1516
<Node id="lista_pac.xhtml" x="275" y="533" zoom="true"/>
16-
<Node id="index.xhtml" x="82" y="397" zoom="true"/>
17+
<Node id="altera_exa.xhtml" x="574" y="409" zoom="true"/>
18+
<Node id="index.xhtml" x="58" y="398" zoom="true"/>
1719
<Node id="altera_med.xhtml" x="659" y="205" zoom="true"/>
1820
<Node id="lista_med.xhtml" x="664" y="353" zoom="true"/>
1921
<Node id="cad_med.xhtml" x="643" y="74" zoom="true"/>

‎src/java/com/DAO/RelatorioDAO.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
*/
55
package com.DAO;
66

7+
import com.control.RelatorioBean;
8+
import com.model.Agenda;
9+
import com.model.AgendaPK;
710
import com.util.Conexao;
11+
import java.util.ArrayList;
12+
import java.util.Date;
13+
import java.util.List;
814
import javax.faces.model.ListDataModel;
915
import javax.persistence.EntityManager;
1016
import javax.persistence.Query;
@@ -14,16 +20,17 @@
1420
* @author mateus
1521
*/
1622
public class RelatorioDAO {
17-
public ListDataModel pesquisa(String dataInicial, String dataFinal, boolean faturamento){
23+
public List<Agenda> pesquisa(String dataInicial, String dataFinal, boolean faturamento){
24+
System.out.println("########" + dataInicial +" "+ dataFinal);
1825
try{
1926
EntityManager em = Conexao.getEntityManager();
20-
Query q = em.createQuery("SELECT a FROM Agenda a WHERE dataHora BETWEEN \':dataIncial\' AND \':dataFinal\'");
27+
Query q = em.createQuery("SELECT a FROM Agenda a WHERE dataHora BETWEEN :dataInicial AND :dataFinal");
2128
q.setParameter("dataInicial", dataInicial);
22-
q.setParameter("dataFinal", dataInicial);
29+
q.setParameter("dataFinal", dataFinal);
2330

24-
ListDataModel resultado = (ListDataModel) q.getResultList();
31+
List<Agenda> agenda = q.getResultList();
2532

26-
return resultado;
33+
return agenda;
2734
}catch(Exception e){
2835
return null;
2936
}

0 commit comments

Comments
 (0)