Mejorada la sincronización de manera significativa. Bugfix al error d…

…el commit anterior solucionado. Fixes a varios errores críticos dentro del sistema en varios elementos distintos.
afestupinanp · Jun 5, 2019 · 6ca97f2 · 6ca97f2
1 parent c4d0bef
commit 6ca97f2
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 162 deletions.
diff --git a/src/techdomotica/java/forms/devices/DeviceManager.java b/src/techdomotica/java/forms/devices/DeviceManager.java
@@ -95,7 +95,8 @@ public void run() {
                 while(continueOnThread) {
                     try {
                         Thread.sleep(2000);
-                        System.out.println("bruh");
+                        checkComponentUse();
+                        /*System.out.println("bruh");
                         for(int i = 0 ; i < allButtons.length ; i++) {
                             switch(i) {
                                 case 0:
@@ -131,7 +132,7 @@ public void run() {
                                     }
                                     break;
                             }
-                        }
+                        }*/
                     }
                     catch(InterruptedException e) {
                         System.out.println(e);
@@ -1893,31 +1894,13 @@ private void btndeleteprojectorActionPerformed(java.awt.event.ActionEvent evt) {
     }//GEN-LAST:event_btndeleteprojectorActionPerformed
 
     private void rdbtnprojectoronActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rdbtnprojectoronActionPerformed
-        progressDialog dialogo = new progressDialog(this, true, 25) {
-            @Override
-            public void progressBarFilled() {
-                ambiente.getTelevisor().toggleComponenteEncendido(true);
-                rdbtnprojectoron.setSelected(true);
-                checkComponentUse();
-            }
-        };
-        dialogo.setTitle("Encendiendo dispositivo");
-        dialogo.textVar.setText("<html>Modificando valores del dispositivo " + ambiente.getTelevisor().getComponenteFullName() + ", puede tardar unos segundos...</html>");
-        dialogo.setVisible(true);
+        toggleDevice(ambiente.getTelevisor(), 15, true);
+        rdbtnprojectoron.setSelected(true);
     }//GEN-LAST:event_rdbtnprojectoronActionPerformed
 
     private void rdbtnprojectoroffActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rdbtnprojectoroffActionPerformed
-        progressDialog dialogo = new progressDialog(this, true, 25) {
-            @Override
-            public void progressBarFilled() {
-                ambiente.getTelevisor().toggleComponenteEncendido(false);
-                rdbtnprojectoroff.setSelected(true);
-                checkComponentUse();
-            }
-        };
-        dialogo.setTitle("Apagando dispositivo");
-        dialogo.textVar.setText("<html>Modificando valores del dispositivo " + ambiente.getTelevisor().getComponenteFullName() + ", puede tardar unos segundos...</html>");
-        dialogo.setVisible(true);
+        toggleDevice(ambiente.getTelevisor(), 15, false);
+        rdbtnprojectoroff.setSelected(true);
     }//GEN-LAST:event_rdbtnprojectoroffActionPerformed
 
     public void saveChangesToMain() {}

diff --git a/src/techdomotica/java/forms/gestorusuarios/Usuarios.java b/src/techdomotica/java/forms/gestorusuarios/Usuarios.java
@@ -263,8 +263,9 @@ else if(evt.getClickCount() == 1) {
     private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
         int conf = JOptionPane.showConfirmDialog(null, "¿Estás seguro de eliminar al usuario " + users.get(selectedRow).getFullName() + "?\nEsta acción es irreversible.", "Confirmación de eliminación", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
         if(conf == JOptionPane.YES_OPTION) {
-            if(conx.execute("DELETE FROM usuario WHERE id_usuario = " + Integer.parseInt(users.get(selectedRow).getID()) +";") == 1) { 
+            if(conx.execute("UPDATE usuario SET habilitado = 0 WHERE id_usuario = " + Integer.parseInt(users.get(selectedRow).getID()) +";") == 1) { 
                 loadTable();
+                JOptionPane.showMessageDialog(null, "El usuario se ha deshabilitado exitosamente.", "Operación completada", JOptionPane.INFORMATION_MESSAGE);
             }
         }
     }//GEN-LAST:event_jButton1ActionPerformed

diff --git a/src/techdomotica/java/forms/security/SecurityAddRep.form b/src/techdomotica/java/forms/security/SecurityAddRep.form
@@ -83,6 +83,7 @@
           </Properties>
           <Events>
             <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="areaReportKeyPressed"/>
+            <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="areaReportKeyTyped"/>
           </Events>
         </Component>
       </SubComponents>

diff --git a/src/techdomotica/java/forms/security/SecurityAddRep.java b/src/techdomotica/java/forms/security/SecurityAddRep.java
@@ -48,6 +48,9 @@ private void initComponents() {
             public void keyPressed(java.awt.event.KeyEvent evt) {
                 areaReportKeyPressed(evt);
             }
+            public void keyTyped(java.awt.event.KeyEvent evt) {
+                areaReportKeyTyped(evt);
+            }
         });
         jScrollPane1.setViewportView(areaReport);
 
@@ -111,12 +114,17 @@ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
     }//GEN-LAST:event_jButton1ActionPerformed
 
     private void areaReportKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_areaReportKeyPressed
+
+    }//GEN-LAST:event_areaReportKeyPressed
+
+    private void areaReportKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_areaReportKeyTyped
         String currentText = areaReport.getText();
-        if(currentText.length() > 1001) {
-            areaReport.setText(currentText);
+        if(currentText.length() >= 1000) {
+            String realText = currentText.substring(0, 999);
+            areaReport.setText(realText);
         }
         charLim.setText(String.format("Límite de caracteres: %d/1000", currentText.length()));
-    }//GEN-LAST:event_areaReportKeyPressed
+    }//GEN-LAST:event_areaReportKeyTyped
 
     /**
      * @param args the command line arguments

diff --git a/src/techdomotica/java/forms/security/SecurityHistory.form b/src/techdomotica/java/forms/security/SecurityHistory.form
@@ -245,6 +245,7 @@
               </Properties>
               <Events>
                 <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="txtReportKeyPressed"/>
+                <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="txtReportKeyTyped"/>
               </Events>
             </Component>
           </SubComponents>

diff --git a/src/techdomotica/java/forms/security/SecurityHistory.java b/src/techdomotica/java/forms/security/SecurityHistory.java
@@ -161,6 +161,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             public void keyPressed(java.awt.event.KeyEvent evt) {
                 txtReportKeyPressed(evt);
             }
+            public void keyTyped(java.awt.event.KeyEvent evt) {
+                txtReportKeyTyped(evt);
+            }
         });
         jScrollPane2.setViewportView(txtReport);
 
@@ -261,17 +264,22 @@ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
     }//GEN-LAST:event_jButton1ActionPerformed
 
     private void txtReportKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtReportKeyPressed
-        String currentText = txtReport.getText();
-        if(currentText.length() > 1001) {
-            txtReport.setText(currentText);
-        }
-        charRemaining.setText(String.format("Caracteres restantes: %d", (1000 - currentText.length())));
+
     }//GEN-LAST:event_txtReportKeyPressed
 
     private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed
         loadTable(jCheckBox1.isSelected());
     }//GEN-LAST:event_jCheckBox1ActionPerformed
 
+    private void txtReportKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtReportKeyTyped
+        String currentText = txtReport.getText();
+        if(currentText.length() >= 1000) {
+            String realText = currentText.substring(0, 999);
+            txtReport.setText(realText);
+        }
+        charRemaining.setText(String.format("Caracteres restantes: %d", (1000 - currentText.length())));
+    }//GEN-LAST:event_txtReportKeyTyped
+
     /**
      * @param args the command line arguments
      */