Merge pull request #13 from Filmaluco/ClientBranch-TableViewColumns

Added: Initial Columns for File and Transfer Views Updated: Settings View

Client/src/Controllers/View/BrowseController.java

@@ -1,4 +1,22 @@
 package Controllers.View;
 
-public class BrowseController {
+import Models.View.File;
+import com.jfoenix.controls.JFXTreeTableView;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+public class BrowseController implements Initializable {
+
+    @FXML
+    private JFXTreeTableView<File> ttvBrowse;
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+
+    }
 }

Client/src/Controllers/View/FileController.java

@@ -1,4 +1,64 @@
 package Controllers.View;
 
-public class FileController {
+import Models.View.File;
+import com.jfoenix.controls.JFXTreeTableColumn;
+import com.jfoenix.controls.JFXTreeTableView;
+import com.jfoenix.controls.RecursiveTreeItem;
+import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableColumn;
+import javafx.util.Callback;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+public class FileController implements Initializable {
+
+    @FXML
+    private JFXTreeTableView<File> ttvFiles;
+
+    public ObservableList<File> files = FXCollections.observableArrayList();
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        ttvFiles.getStyleClass().add("noheader");
+
+        //Setting up columns
+        JFXTreeTableColumn<File, String> filename = new JFXTreeTableColumn<>("Filename");
+        filename.setPrefWidth(400);
+        filename.setCellValueFactory(new Callback<TreeTableColumn.CellDataFeatures<File, String>, ObservableValue<String>>() {
+            @Override
+            public ObservableValue<String> call(TreeTableColumn.CellDataFeatures<File, String> param) {
+                return param.getValue().getValue().filenameProperty();
+            }
+        });
+
+
+        JFXTreeTableColumn<File, String> fileSize = new JFXTreeTableColumn<>("FileSize");
+        fileSize.setPrefWidth(400);
+        fileSize.setCellValueFactory(new Callback<TreeTableColumn.CellDataFeatures<File, String>, ObservableValue<String>>() {
+            @Override
+            public ObservableValue<String> call(TreeTableColumn.CellDataFeatures<File, String> param) {
+                return param.getValue().getValue().sizeProperty();
+            }
+        });
+
+        //Adding files to observable array
+        //files.add(new File("Test","1GB", "JohnDoe", "21/11/2018"));
+
+        final TreeItem<File> root = new RecursiveTreeItem<File>(files, RecursiveTreeObject::getChildren);
+        ttvFiles.getColumns().setAll(filename, fileSize);
+        ttvFiles.setRoot(root);
+        ttvFiles.setShowRoot(false);
+    }
+
+    public void addFile(ActionEvent event) {
+        //TODO: Show file chooser and get the file to send
+    }
 }

Client/src/Controllers/View/LoginController.java

@@ -3,19 +3,27 @@
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXTextField;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import javafx.scene.control.Label;
 import javafx.stage.StageStyle;
+import sun.applet.Main;
 
+import java.awt.*;
+import java.awt.image.SampleModel;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 
+import static javafx.collections.FXCollections.observableArrayList;
+
 public class LoginController implements Initializable {
     @FXML
     private JFXTextField usernameField;
@@ -29,19 +37,24 @@ public class LoginController implements Initializable {
     @FXML
     private JFXButton btnGuestLogin;
 
+    @FXML
+    private Label lbWarning;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         //TODO: Update visual changes
+        //setWarning();
+        ObservableList<String> list = FXCollections.observableArrayList();
     }
 
     @FXML
-    public void userLogin(ActionEvent event) {
+    private void userLogin(ActionEvent event) {
         String username = usernameField.getText();
         String password = passwordField.getText();
 
         //TODO: Implement real authentication
-        if (username.equals("MegaPD") && password.equals("PD2018")){
+
+        if (true){
             closeStage();
             loadMain();
         }
@@ -64,7 +77,11 @@ void loadMain(){
     }
 
     @FXML
-    public void guestLogin(ActionEvent event) {
+    private void guestLogin(ActionEvent event) {
         //TODO: Implement
     }
+
+    public void setWarning(String warning){
+        lbWarning.setText(warning);
+    }
 }

Client/src/Controllers/View/TransferController.java

@@ -1,4 +1,77 @@
 package Controllers.View;
 
-public class TransferController {
+import Models.View.File;
+import com.jfoenix.controls.JFXTreeTableColumn;
+import com.jfoenix.controls.JFXTreeTableView;
+import com.jfoenix.controls.RecursiveTreeItem;
+import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableColumn;
+import javafx.util.Callback;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+public class TransferController implements Initializable {
+    @FXML
+    private JFXTreeTableView<File> ttvTransfers;
+
+    public ObservableList<File> transfers = FXCollections.observableArrayList();
+
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        ttvTransfers.getStyleClass().add("noheader");
+
+        //Setting up columns
+        JFXTreeTableColumn<File, String> filename = new JFXTreeTableColumn<>("Filename");
+        filename.setPrefWidth(170);
+        filename.setCellValueFactory(new Callback<TreeTableColumn.CellDataFeatures<File, String>, ObservableValue<String>>() {
+            @Override
+            public ObservableValue<String> call(TreeTableColumn.CellDataFeatures<File, String> param) {
+                return param.getValue().getValue().filenameProperty();
+            }
+        });
+
+
+        JFXTreeTableColumn<File, String> fileSize = new JFXTreeTableColumn<>("FileSize");
+        fileSize.setPrefWidth(170);
+        fileSize.setCellValueFactory(new Callback<TreeTableColumn.CellDataFeatures<File, String>, ObservableValue<String>>() {
+            @Override
+            public ObservableValue<String> call(TreeTableColumn.CellDataFeatures<File, String> param) {
+                return param.getValue().getValue().sizeProperty();
+            }
+        });
+
+        JFXTreeTableColumn<File, String> downloadedFrom = new JFXTreeTableColumn<>("DownloadedFrom");
+        downloadedFrom.setPrefWidth(170);
+        downloadedFrom.setCellValueFactory(new Callback<TreeTableColumn.CellDataFeatures<File, String>, ObservableValue<String>>() {
+            @Override
+            public ObservableValue<String> call(TreeTableColumn.CellDataFeatures<File, String> param) {
+                return param.getValue().getValue().downloadedFromProperty();
+            }
+        });
+
+        JFXTreeTableColumn<File, String> downloadedDate = new JFXTreeTableColumn<>("DownloadedDate");
+        downloadedDate.setPrefWidth(170);
+        downloadedDate.setCellValueFactory(new Callback<TreeTableColumn.CellDataFeatures<File, String>, ObservableValue<String>>() {
+            @Override
+            public ObservableValue<String> call(TreeTableColumn.CellDataFeatures<File, String> param) {
+                return param.getValue().getValue().downloadDateProperty();
+            }
+        });
+
+        //Adding files to observable array
+        //transfers.add(new File("Test","1GB", "JohnDoe", "21/11/2018"));
+
+        final TreeItem<File> root = new RecursiveTreeItem<File>(transfers, RecursiveTreeObject::getChildren);
+        ttvTransfers.getColumns().setAll(filename, fileSize, downloadedFrom, downloadedDate);
+        ttvTransfers.setRoot(root);
+        ttvTransfers.setShowRoot(false);
+    }
 }

Client/src/Main.java

@@ -4,19 +4,21 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-public class Main  extends Application {
+public class Main extends Application {
 
     public static void main(String[] args) { launch(args); }
 
     @Override
     public void start(Stage primaryStage) throws Exception {
         Parent root = FXMLLoader.load(getClass().getResource("Views/Layouts/login.fxml"));
+        //Parent root = FXMLLoader.load(getClass().getResource("Views/Layouts/main.fxml"));
 
         Scene login = new Scene(root);
 
         primaryStage.setTitle("Mega PD");
         primaryStage.setScene(login);
         primaryStage.setResizable(false);
         primaryStage.show();
+
     }
 }

Client/src/Models/View/File.java

@@ -0,0 +1,58 @@
+package Models.View;
+
+import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class File extends RecursiveTreeObject<File> {
+    StringProperty filename;
+    StringProperty size;
+    StringProperty downloadedFrom;
+    StringProperty downloadDate;
+
+
+    public File(String filename, String size, String downloadedFrom, String downloadDate) {
+        this.filename = new SimpleStringProperty(filename);
+        this.size = new SimpleStringProperty(size);
+        this.downloadedFrom = new SimpleStringProperty(downloadedFrom);
+        this.downloadDate = new SimpleStringProperty(downloadDate);
+    }
+
+    public File(String filename, String size) {
+        this.filename = new SimpleStringProperty(filename);
+        this.size = new SimpleStringProperty(size);
+    }
+
+
+    public String getFilename() {
+        return filename.get();
+    }
+
+    public StringProperty filenameProperty() {
+        return filename;
+    }
+
+    public String getSize() {
+        return size.get();
+    }
+
+    public StringProperty sizeProperty() {
+        return size;
+    }
+
+    public String getDownloadedFrom() {
+        return downloadedFrom.get();
+    }
+
+    public StringProperty downloadedFromProperty() {
+        return downloadedFrom;
+    }
+
+    public String getDownloadDate() {
+        return downloadDate.get();
+    }
+
+    public StringProperty downloadDateProperty() {
+        return downloadDate;
+    }
+}

Client/src/Views/Layouts/browse.fxml

@@ -36,7 +36,7 @@
                 </AnchorPane>
                 <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
                     <children>
-                        <JFXTreeTableView layoutX="-7.0" layoutY="5.0" prefHeight="450.0" prefWidth="603.0" />
+                        <JFXTreeTableView fx:id="ttvBrowse" layoutX="-7.0" layoutY="5.0" prefHeight="450.0" prefWidth="603.0" />
                     </children>
                 </AnchorPane>
             </items>

Client/src/Views/Layouts/file.fxml

@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
-
-<?import javafx.scene.layout.*?>
-
 <?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXTreeTableView?>
 <?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?>
 <?import javafx.geometry.Insets?>
-<?import com.jfoenix.controls.JFXTreeTableView?>
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="Controllers.View.FileController"
-            prefHeight="460.0" prefWidth="683.0">
+<?import javafx.scene.layout.AnchorPane?>
+
+<AnchorPane prefHeight="460.0" prefWidth="683.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Controllers.View.FileController">
     <children>
-        <JFXButton id="fileButton" layoutX="683.0" layoutY="460.0" prefHeight="33.0" prefWidth="103.0" text="File">
+        <JFXButton id="bntFile" fx:id="btnFile"  onAction="#addFile" layoutX="683.0" layoutY="460.0" prefHeight="33.0" prefWidth="103.0" text="File">
             <graphic>
                 <FontAwesomeIconView glyphName="FILE" size="15" />
             </graphic>
@@ -25,6 +19,6 @@
                 <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
             </padding>
         </JFXButton>
-        <JFXTreeTableView prefHeight="450.0" prefWidth="800.0" />
+        <JFXTreeTableView fx:id="ttvFiles" prefHeight="450.0" prefWidth="800.0" />
     </children>
 </AnchorPane>

Client/src/Views/Layouts/login.fxml

@@ -41,5 +41,6 @@
             <Image url="@../../Resources/Images/FullLogo.png" />
          </image>
       </ImageView>
+      <Label id="lbWarning" fx:id="lbWarning" alignment="CENTER" layoutX="14.0" layoutY="14.0" prefHeight="17.0" prefWidth="575.0" textAlignment="CENTER" textFill="#d00000" wrapText="true" />
    </children>
 </AnchorPane>

Client/src/Views/Layouts/main.css

@@ -70,3 +70,10 @@
 {
     -fx-background-color: WHITE; /*Yellow - bottom bar*/
 }
+
+/* Tree Table View Remover Header Style Class */
+.noheader .column-header-background {
+    -fx-max-height: 0;
+    -fx-pref-height: 0;
+    -fx-min-height: 0;
+}