#178: show color of project

Author: Death111

src/main/java/de/doubleslash/keeptime/view/ExternalProjectsSyncController.java

@@ -17,6 +17,7 @@
 import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
+import javafx.scene.shape.Circle;
 import javafx.util.converter.LocalTimeStringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -122,8 +123,8 @@ public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems
          if (!isMappedInHeimat) {
             canBeSynced = "Not mapped in Heimat";
          }
-         list.add(new TableRow(project, isMappedInHeimat, canBeSynced, heimatNotes, keeptimeNotes, keeptimeNotes, heimatTimeSeconds,
-               projectWorkSeconds, projectWorkSeconds));
+         list.add(new TableRow(project, isMappedInHeimat, canBeSynced, heimatNotes, keeptimeNotes, keeptimeNotes,
+               heimatTimeSeconds, projectWorkSeconds, projectWorkSeconds));
       }
       final ObservableList<TableRow> items = FXCollections.observableArrayList(list);
       mappingTableView.setItems(items);
@@ -148,10 +149,27 @@ private void initialize() {
       shouldSyncColumn.setEditable(true);
       shouldSyncColumn.setPrefWidth(50);
 
-      TableColumn<TableRow, String> projectColumn = new TableColumn<>("Project");
-      projectColumn.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().project.getName()));
+      TableColumn<TableRow, Project> projectColumn = new TableColumn<>("Project");
+      projectColumn.setCellValueFactory(data -> new SimpleObjectProperty(data.getValue().project));
+      projectColumn.setCellFactory(column -> new TableCell<>() {
+         //private final Label label = new Label();
+
+         @Override
+         protected void updateItem(Project item, boolean empty) {
+            super.updateItem(item, empty);
+            if (empty || item == null) {
+               setGraphic(null);
+               setText(null);
+            } else {
+               //label.setText(item.getName());
+               setText(item.getName());
+               final Circle circle = new Circle(6, item.getColor());
+               this.setGraphic(circle);
+            }
+         }
+      });
       projectColumn.setPrefWidth(100);
-      // TODO set color
+
       TableColumn<TableRow, TableRow> timeColumn = new TableColumn<>("Time");
       timeColumn.setCellValueFactory(data -> new SimpleObjectProperty<>(data.getValue())); // Placeholder property
 

src/main/java/de/doubleslash/keeptime/view/ReportController.java

@@ -160,7 +160,7 @@ private void showSyncStage() throws IOException {
          //settingsController.setStage(settingsStage);
          settingsStage.initModality(Modality.APPLICATION_MODAL);
          settingsStage.setTitle("External Project Sync");
-         settingsStage.setResizable(false);
+         settingsStage.setResizable(true);
          settingsStage.getIcons().add(new Image(Resources.getResource(RESOURCE.ICON_MAIN).toString()));
 
          final Scene settingsScene = new Scene(settingsRoot);

src/main/resources/layouts/externalProjectSync.fxml

@@ -9,7 +9,7 @@
 
 <AnchorPane prefHeight="600.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ExternalProjectsSyncController">
    <children>
-      <TableView fx:id="mappingTableView" layoutY="50.0" prefHeight="442.0" prefWidth="600.0" />
+      <TableView fx:id="mappingTableView" layoutY="50.0" prefHeight="442.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" />
       <Label text="Sync dialog">
          <font>
             <Font name="System Bold" size="15.0" />