Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chat #11

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chat #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
272a796
chat
DorWolfgor Feb 27, 2022
b5f4526
Merge branch 'main' into chat
shlior7 Feb 27, 2022
98eba11
no chat
shlior7 Feb 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 45 additions & 44 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Admin/src/app/components/TaskControllerAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import javafx.application.Platform;
import javafx.event.ActionEvent;
import javafx.fxml.FXMLLoader;
import javafx.scene.control.TextArea;
import javafx.scene.layout.Pane;
import okhttp3.HttpUrl;
import types.Task;
Expand Down
1 change: 0 additions & 1 deletion Admin/src/app/components/TaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.control.*;
import javafx.scene.layout.Pane;
Expand Down
6 changes: 4 additions & 2 deletions Admin/src/app/dashboard/Dashboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
import TargetGraph.TargetGraph;
import TargetGraph.GraphParams;
import app.components.TaskControllerAdmin;
import app.components.taskSettingsManager;
import graphApp.GraphPane;
import javafx.application.Platform;
import javafx.beans.property.BooleanProperty;
import javafx.collections.FXCollections;
import javafx.event.ActionEvent;
import javafx.event.Event;
Expand All @@ -15,6 +13,7 @@
import javafx.fxml.Initializable;
import javafx.scene.Scene;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import javafx.scene.control.TableView;
import javafx.scene.layout.AnchorPane;
Expand Down Expand Up @@ -58,6 +57,8 @@ public class Dashboard extends Stage implements Initializable {
public ComboBox<String> graphComboBox;
@FXML
public AnchorPane graphsRoot;
@FXML
public Tab chatTab;

public static Dashboard createDashboard() throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(Dashboard.class.getResource("admin_dashboard.fxml"));
Expand All @@ -72,6 +73,7 @@ public static Dashboard createDashboard() throws IOException {
return dashboard;
}


@Override
public void initialize(URL location, ResourceBundle resources) {
}
Expand Down
12 changes: 2 additions & 10 deletions Admin/src/app/dashboard/admin_dashboard.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<?import javafx.collections.FXCollections?>
<?import types.GraphInfo?>
<?import javafx.scene.control.cell.PropertyValueFactory?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.control.ComboBox?>

<TabPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="839.0"
prefWidth="1594.0" tabClosingPolicy="UNAVAILABLE" xmlns="http://javafx.com/javafx/8.0.171"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.dashboard.Dashboard">
Expand Down Expand Up @@ -221,12 +218,7 @@
</BorderPane>
</AnchorPane>
</Tab>
<Tab text="Task">
<Tab text="Chat" fx:id="chatTab">
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"/>
</Tab>
<Tab text="Actions on graph">
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<Button text="sad" onAction="#open"/>
</AnchorPane>
</Tab>
</TabPane>
5 changes: 5 additions & 0 deletions Admin/src/app/main/AdminApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,9 @@ public void register(ActionEvent actionEvent) throws IOException {
HttpClientUtil.runAsync(finalUrl, new SimpleCallBack((s) -> controller.show()));
}

@Override
public void stop() {
HttpClientUtil.shutdown();
}

}
Loading