Iniciada a implementação das classes finais.

clevertonh · Dec 14, 2015 · f34fa1d · f34fa1d
1 parent 3fb5b9d
commit f34fa1d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 53 deletions.
diff --git a/MinhaFazenda/LogMinhaFazenda.log b/MinhaFazenda/LogMinhaFazenda.log
@@ -1,4 +1,2 @@
-Dez 13, 2015 5:28:01 PM com.minhafazenda.util.MasterLog addInfo
-INFORMAÇÕES: [com.minhafazenda.controller.UsuarioController] Usuário 'sdadasdsa' ADICIONADO com sucesso
-Dez 13, 2015 5:28:28 PM com.minhafazenda.util.MasterLog addInfo
-INFORMAÇÕES: [com.minhafazenda.controller.UsuarioController] Usuário 'sdadasdsa' ATUALIZADO com sucesso
+dez 14, 2015 8:47:03 PM com.minhafazenda.util.MasterLog addInfo
+INFORMAÇÕES: [com.minhafazenda.controller.UsuarioController] Usuário 'teste' ADICIONADO com sucesso
diff --git a/MinhaFazenda/src/com/minhafazenda/controller/MfAuditoriaConfiguracaoViewController.java b/MinhaFazenda/src/com/minhafazenda/controller/MfAuditoriaConfiguracaoViewController.java
@@ -21,11 +21,11 @@ public class MfAuditoriaConfiguracaoViewController extends AbstractTableModel {
     private final MfAuditoriaViewModel objModel;
     private ArrayList<MfAuditoriaView> lst = null;
     private String[] lstColunas = null;
-    private String[] column = {"Código", "Usuario", "Chave Primaria 1", "Chave Primaria 2","Ação", "Data"};
+    private String[] column = {"Código", "Chave Primaria 1", "Chave Primaria 2","Ação", "Data"};
 
     public MfAuditoriaConfiguracaoViewController() {
         this.objModel = new MfAuditoriaViewModel();
-        setColunas(new String[]{"id", "usuario", "chave_primaria_1", "chave_primaria_2","acao", "data_hora"});
+        setColunas(new String[]{"id", "chave_primaria_1", "chave_primaria_2","acao", "data_hora"});
     }     
 
     public String getColumnName(int columnIndex) {
@@ -72,18 +72,15 @@ public Object getValueAt(int linhaIndex, int colunaIndex) {
                 value = c.getId();
                 break;
             case 1:
-                value = c.getUsuario();
-                break;
-            case 2:
                 value = c.getChave_primaria_1();
                 break;
-            case 3:
+            case 2:
                 value = c.getChave_primaria_2();
                 break;
-            case 4:
+            case 3:
                 value = c.getAcao();
                 break;
-            case 5:
+            case 4:
                 value = c.getData_hora();
                 break;
 

diff --git a/MinhaFazenda/src/com/minhafazenda/util/sql/ScriptView-ProducaoLeiteHoje.sql b/MinhaFazenda/src/com/minhafazenda/util/sql/ScriptView-ProducaoLeiteHoje.sql
@@ -1,4 +1,5 @@
 CREATE VIEW view_producao_leite_hoje AS
+
 SELECT 
 	pl.id
 	,pl.data_hora
@@ -18,5 +19,4 @@ FROM
 				LEFT JOIN grau_sangue AS gs ON
 					ani.grau_sangue_id = gs.id
 WHERE
-	pl.data_hora >= curdate()
-	AND pl.data_hora <= curdate()
+    STR_TO_DATE(pl.data_hora, '%Y-%m-%d') = curdate()
diff --git a/MinhaFazenda/src/com/minhafazenda/view/FrmPrincipal.form b/MinhaFazenda/src/com/minhafazenda/view/FrmPrincipal.form
@@ -119,14 +119,6 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem2ActionPerformed"/>
               </Events>
             </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem3">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Vencimento de vacina"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem3ActionPerformed"/>
-              </Events>
-            </MenuItem>
           </SubComponents>
         </Menu>
       </SubComponents>
@@ -187,7 +179,7 @@
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" attributes="0">
-                  <EmptySpace pref="472" max="32767" attributes="0"/>
+                  <EmptySpace pref="484" max="32767" attributes="0"/>
                   <Component id="jPanel1" min="-2" pref="218" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>

diff --git a/MinhaFazenda/src/com/minhafazenda/view/FrmPrincipal.java b/MinhaFazenda/src/com/minhafazenda/view/FrmPrincipal.java
@@ -177,7 +177,6 @@ private void initComponents()
         jMenuRelatorio = new javax.swing.JMenu();
         jMenuItem1 = new javax.swing.JMenuItem();
         jMenuItem2 = new javax.swing.JMenuItem();
-        jMenuItem3 = new javax.swing.JMenuItem();
 
         jFormattedTextField1.setText("jFormattedTextField1");
 
@@ -339,7 +338,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt)
         jDesktopPane1Layout.setHorizontalGroup(
             jDesktopPane1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jDesktopPane1Layout.createSequentialGroup()
-                .addContainerGap(472, Short.MAX_VALUE)
+                .addContainerGap(484, Short.MAX_VALUE)
                 .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 218, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
@@ -463,16 +462,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt)
         });
         jMenuRelatorio.add(jMenuItem2);
 
-        jMenuItem3.setText("Vencimento de vacina");
-        jMenuItem3.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
-                jMenuItem3ActionPerformed(evt);
-            }
-        });
-        jMenuRelatorio.add(jMenuItem3);
-
         jMenuBar1.add(jMenuRelatorio);
 
         setJMenuBar(jMenuBar1);
@@ -791,23 +780,6 @@ private void jMenuItem2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
         }
     }//GEN-LAST:event_jMenuItem2ActionPerformed
 
-    private void jMenuItem3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem3ActionPerformed
-        if (relVencimentoVacina == null) {
-            //Cria o form
-            relVencimentoVacina = new RelVencimentoVacina();
-            //Adiciona o formulario dentro do DESKTOP
-            this.jDesktopPane1.add(relVencimentoVacina);
-            //diz que a janela interna é maximizável
-            relVencimentoVacina.setMaximizable(true);
-            //set o tamanho máximo dela, que depende da janela pai
-            //frmCategoria.setMaximum(true);
-        }
-        if (!relVencimentoVacina.isVisible()) {
-            //Mostra o formulário
-            relVencimentoVacina.setVisible(true);
-        }
-    }//GEN-LAST:event_jMenuItem3ActionPerformed
-
     private void btnProducaoLeiteActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnProducaoLeiteActionPerformed
     {//GEN-HEADEREND:event_btnProducaoLeiteActionPerformed
         if (frmProducaoLeiteListagem == null) {
@@ -882,7 +854,6 @@ private void btnProducaoLeiteActionPerformed(java.awt.event.ActionEvent evt)//GE
     private javax.swing.JMenu jMenuDiversos;
     private javax.swing.JMenuItem jMenuItem1;
     private javax.swing.JMenuItem jMenuItem2;
-    private javax.swing.JMenuItem jMenuItem3;
     private javax.swing.JMenu jMenuRelatorio;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JScrollPane jScrollPane1;