diff --git a/out/production/ClockInMachine/sample/controllers/AdminPaneController.class b/out/production/ClockInMachine/sample/controllers/AdminPaneController.class
index 47bf899..b80bde5 100644
Binary files a/out/production/ClockInMachine/sample/controllers/AdminPaneController.class and b/out/production/ClockInMachine/sample/controllers/AdminPaneController.class differ
diff --git a/out/production/ClockInMachine/sample/views/AdminPane.fxml b/out/production/ClockInMachine/sample/views/AdminPane.fxml
index 9bbb6c8..8cac26d 100644
--- a/out/production/ClockInMachine/sample/views/AdminPane.fxml
+++ b/out/production/ClockInMachine/sample/views/AdminPane.fxml
@@ -31,11 +31,11 @@
-
+
-
+
diff --git a/src/sample/controllers/AdminPaneController.java b/src/sample/controllers/AdminPaneController.java
index e8f8629..e6fba89 100644
--- a/src/sample/controllers/AdminPaneController.java
+++ b/src/sample/controllers/AdminPaneController.java
@@ -10,6 +10,7 @@
import javafx.scene.control.TableView;
import javafx.scene.control.TextField;
import javafx.scene.control.cell.PropertyValueFactory;
+import sample.controllers.Classes.Clocks;
import java.io.IOException;
import java.sql.PreparedStatement;
@@ -60,23 +61,29 @@ void backButtonAction(ActionEvent event) throws IOException {
}
-
@FXML
- void isNullButton(ActionEvent event) throws SQLException, ClassNotFoundException {
- String query = "select * from `30712964_clock_in`.clocks where clock_out is null or clock_in is null";
+ void dateCheckButton(ActionEvent event) throws SQLException, ClassNotFoundException {
+ String query = "select * from `30712964_clock_in`.clocks where date='"+dateInput.getText()+"'";
setupList(query, emailTable, dateTable, clockInTable, clockOutTable, serverConnect, fullTable);
- System.out.println("Tu jestem 1");
}
- private void update_list(String query) throws SQLException, ClassNotFoundException {
+ @FXML
+ void isNullButton(ActionEvent event) throws SQLException, ClassNotFoundException {
+ String query = "select * from `30712964_clock_in`.clocks where clock_out is null or clock_in is null";
+ setupList(query, emailTable, dateTable, clockInTable, clockOutTable, serverConnect, fullTable);
- //setupList(query, emailTable, dateTable, clockInTable, clockOutTable, serverConnect, fullTable);
+ }
+ @FXML
+ void emailCheckButton(ActionEvent event) throws SQLException, ClassNotFoundException {
+ String query = "select * from `30712964_clock_in`.clocks where username='"+emaiInput.getText()+"'";
+ setupList(query, emailTable, dateTable, clockInTable, clockOutTable, serverConnect, fullTable);
}
+
static void setupList(String query, TableColumn emailTable, TableColumn dateTable, TableColumn clockInTable, TableColumn clockOutTable, ServerConnect serverConnect, TableView fullTable) throws SQLException, ClassNotFoundException {
emailTable.setCellValueFactory(new PropertyValueFactory<>("email"));
@@ -86,13 +93,11 @@ static void setupList(String query, TableColumn emailTable, Tabl
clockInTable.setCellValueFactory(new PropertyValueFactory<>("clockIn"));
clockOutTable.setCellValueFactory(new PropertyValueFactory<>("clockOut"));
ObservableList observableList = FXCollections.observableArrayList();
- System.out.println("Tu jestem 2");
serverConnect.getConnection();
- System.out.println("Tu jestem 3");
PreparedStatement statement = serverConnect.connection.prepareCall(query);
- System.out.println("Tu jestem 4");
+
ResultSet rs = statement.executeQuery();
- System.out.println("Tu jestem 5");
+
while (rs.next()){
diff --git a/src/sample/controllers/Clocks.java b/src/sample/controllers/Classes/Clocks.java
similarity index 96%
rename from src/sample/controllers/Clocks.java
rename to src/sample/controllers/Classes/Clocks.java
index 824bce9..3901e44 100644
--- a/src/sample/controllers/Clocks.java
+++ b/src/sample/controllers/Classes/Clocks.java
@@ -1,4 +1,4 @@
-package sample.controllers;
+package sample.controllers.Classes;
public class Clocks {
private String email;
diff --git a/src/sample/controllers/User.java b/src/sample/controllers/Classes/User.java
similarity index 96%
rename from src/sample/controllers/User.java
rename to src/sample/controllers/Classes/User.java
index 60760fc..e120af7 100644
--- a/src/sample/controllers/User.java
+++ b/src/sample/controllers/Classes/User.java
@@ -1,4 +1,4 @@
-package sample.controllers;
+package sample.controllers.Classes;
public class User {
private String name;
diff --git a/src/sample/controllers/AlertWindow.java b/src/sample/controllers/FxScenes/AlertWindow.java
similarity index 89%
rename from src/sample/controllers/AlertWindow.java
rename to src/sample/controllers/FxScenes/AlertWindow.java
index d45dd27..0168a9f 100644
--- a/src/sample/controllers/AlertWindow.java
+++ b/src/sample/controllers/FxScenes/AlertWindow.java
@@ -1,4 +1,4 @@
-package sample.controllers;
+package sample.controllers.FxScenes;
import javafx.scene.control.Alert;
diff --git a/src/sample/controllers/LogInPaneController.java b/src/sample/controllers/LogInPaneController.java
index 4c0a79b..70bd68d 100644
--- a/src/sample/controllers/LogInPaneController.java
+++ b/src/sample/controllers/LogInPaneController.java
@@ -1,7 +1,5 @@
package sample.controllers;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
@@ -9,12 +7,11 @@
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.TextField;
-import javafx.scene.control.cell.PropertyValueFactory;
+import sample.controllers.Classes.Clocks;
+import sample.controllers.Classes.User;
import java.io.IOException;
import java.net.URL;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ResourceBundle;
@@ -39,7 +36,7 @@ public class LogInPaneController implements Initializable {
private TableColumn clock_out_table;
@FXML
private TextField infoField;
- private User user;
+ private User user;
public User getUser() {
return user;
diff --git a/src/sample/controllers/MainPaneController.java b/src/sample/controllers/MainPaneController.java
index fedc876..c0dbc90 100644
--- a/src/sample/controllers/MainPaneController.java
+++ b/src/sample/controllers/MainPaneController.java
@@ -8,6 +8,8 @@
import javafx.scene.Scene;
import javafx.scene.control.*;
import javafx.stage.Stage;
+import sample.controllers.Classes.User;
+import sample.controllers.FxScenes.AlertWindow;
import java.io.IOException;
diff --git a/src/sample/controllers/RegistryPaneController.java b/src/sample/controllers/RegistryPaneController.java
index 6d0c790..0306e4d 100644
--- a/src/sample/controllers/RegistryPaneController.java
+++ b/src/sample/controllers/RegistryPaneController.java
@@ -6,6 +6,7 @@
import javafx.scene.control.CheckBox;
import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField;
+import sample.controllers.FxScenes.AlertWindow;
import java.io.IOException;
import java.sql.CallableStatement;
diff --git a/src/sample/views/AdminPane.fxml b/src/sample/views/AdminPane.fxml
index 9bbb6c8..8cac26d 100644
--- a/src/sample/views/AdminPane.fxml
+++ b/src/sample/views/AdminPane.fxml
@@ -31,11 +31,11 @@
-
+
-
+