added support for value maps

Author: damgem

.gitignore

@@ -1,5 +1,5 @@
 # Custom
-extern/data/*
+data/*
 gradlew
 gradlew.bat
 

.idea/misc.xml

@@ -32,7 +32,6 @@ application {
 javafx {
     version = "15"
     modules = [ 'javafx.controls', 'javafx.fxml' ]
-
 }
 
 apply plugin: 'java'

.idea/runConfigurations.xml

@@ -1,40 +1,40 @@
 {
   "legacyMode": false,
   "legacyProfile": "WS",
-  "windowWidth" : 680,
-  "windowHeight" : 960,
+  "windowWidth": 680,
+  "windowHeight": 960,
   "keyColumnWidth": 150,
   "profiles": {
     "WS": {
       "target": "data/teilnehmer.xls",
       "mapping": {
-        "Kundennummer":  null,
-        "Name":  1,
-        "Vorname":  2,
-        "Anrede":  3,
-        "Geburtsdatum":  4,
+        "Kundennummer": null,
+        "Name": 1,
+        "Vorname": 2,
+        "Anrede": 3,
+        "Geburtsdatum": 4,
         "Strasse": 5,
         "Hausnummer": 6,
-        "PLZ":  7,
-        "Ort":  8,
-        "Telefon1":  null,
-        "Telefon2":  null,
-        "Fax":  null,
-        "eMail":  null,
-        "Mobil":  9,
-        "UserName":  null,
-        "Passwort":  null,
-        "CH1":  10,
-        "CH2":  null,
-        "CH3":  null,
-        "CH4":  null,
-        "CH5":  null,
-        "CH6":  null,
-        "eMail-Privat":  11,
-        "Versand zugestimmt":  12,
-        "Aufmerksam über":  13,
-        "Vorname Erziehungsb.":  14,
-        "Nachname Erziehungsb.":  15
+        "PLZ": 7,
+        "Ort": 8,
+        "Telefon1": null,
+        "Telefon2": null,
+        "Fax": null,
+        "eMail": null,
+        "Mobil": 9,
+        "UserName": null,
+        "Passwort": null,
+        "CH1": 10,
+        "CH2": null,
+        "CH3": null,
+        "CH4": null,
+        "CH5": null,
+        "CH6": null,
+        "eMail-Privat": 11,
+        "Versand zugestimmt": 12,
+        "Aufmerksam über": 13,
+        "Vorname Erziehungsb.": 14,
+        "Nachname Erziehungsb.": 15
       }
     },
     "FB": {
@@ -44,13 +44,17 @@
         "ID1": null,
         "WorkshopID": {
           "sourceColumnIndex": 1,
-          "isRequired": true
+          "isRequired": true,
+          "valueMapName": "numeric-map"
         },
         "Geschlecht": null,
         "Alter": 2,
         "Freiwilligkeit": 3,
         "Gefallen": 4,
-        "Stimmung": 5,
+        "Stimmung": {
+          "sourceColumnIndex": 5,
+          "valueMapName": "schlecht-gut"
+        },
         "Arbeitstempo": 6,
         "Inhalte_ausprobieren": 7,
         "Inhalte_mehr_wissen": 8,
@@ -82,5 +86,14 @@
         "Ich bin erstmals auf die Angebote der Stiftung aufmerksam geworden": 10
       }
     }
+  },
+  "valueMaps": {
+    "schlecht-gut": {
+      "sehr schlecht": "1",
+      "schlecht": "2",
+      "neutral": "3",
+      "gut": "4",
+      "sehr gut": "5"
+    }
   }
 }

.idea/runConfigurations/Run.xml

@@ -1,7 +1,7 @@
 package com.damgem.DataImporter.Connector;
 
 import com.damgem.DataImporter.DataImporterError;
-import com.damgem.DataImporter.Field.Field;
+import com.damgem.DataImporter.Field.NamedValue;
 import com.healthmarketscience.jackcess.*;
 
 import java.io.File;
@@ -12,7 +12,7 @@
 
 public class AccessConnector implements DataConnector {
 
-    private String target, subTarget;
+    private final String target, subTarget;
 
     public AccessConnector(String target, String subTarget) throws DataImporterError {
         if(target == null) {
@@ -50,7 +50,7 @@ private Table openTable() throws DataImporterError {
     }
 
     @Override
-    public void write(String target, String subTarget, List<Field> data) throws DataImporterError {
+    public void write(String target, String subTarget, List<NamedValue> data) throws DataImporterError {
 
         Table table = this.openTable();
 
@@ -66,10 +66,10 @@ public void write(String target, String subTarget, List<Field> data) throws Data
 
         // make sure there are no empty numerical values
         data.forEach(f -> {
-            if(table.getColumn(f.name).getType() == DataType.LONG && f.value.isEmpty().get()) {
+            if(table.getColumn(f.name).getType() == DataType.LONG && f.value.isEmpty()) {
                 map.put(f.name, 0);
             } else {
-                map.put(f.name, f.value.getValue());
+                map.put(f.name, f.value);
             }
         });
 

build.gradle

@@ -1,10 +1,10 @@
 package com.damgem.DataImporter.Connector;
 
 import com.damgem.DataImporter.DataImporterError;
-import com.damgem.DataImporter.Field.Field;
+import com.damgem.DataImporter.Field.NamedValue;
 
 import java.util.List;
 
 public interface DataConnector {
-    void write(String target, String subTarget, List<Field> data) throws DataImporterError;
+    void write(String target, String subTarget, List<NamedValue> data) throws DataImporterError;
 }

extern/config.json

@@ -1,7 +1,7 @@
 package com.damgem.DataImporter.Connector;
 
 import com.damgem.DataImporter.DataImporterError;
-import com.damgem.DataImporter.Field.Field;
+import com.damgem.DataImporter.Field.NamedValue;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 
@@ -13,7 +13,7 @@
 
 public class ExcelConnector implements DataConnector {
 
-    private String target, subTarget;
+    private final String target, subTarget;
 
     private String cellToString(Cell cell) {
         return switch (cell.getCellType()) {
@@ -55,7 +55,7 @@ private Workbook openWorkbook() throws DataImporterError {
         }
     }
 
-    private Sheet openSheet(Workbook workbook) throws DataImporterError {
+    private Sheet openSheet(Workbook workbook) {
         if(this.subTarget != null && !this.subTarget.isEmpty()) {
             Sheet sheet = workbook.getSheet(subTarget);
             return (sheet == null) ? workbook.createSheet(subTarget) : sheet;
@@ -75,7 +75,7 @@ public ExcelConnector(String target, String subTarget) throws DataImporterError
     }
 
     @Override
-    public void write(String target, String subTarget, List<Field> data) throws DataImporterError {
+    public void write(String target, String subTarget, List<NamedValue> data) throws DataImporterError {
 
         Workbook workbook = this.openWorkbook();
         Sheet sheet = this.openSheet(workbook);
@@ -93,7 +93,7 @@ public void write(String target, String subTarget, List<Field> data) throws Data
         }
 
         // insert data
-        List<String> dataFieldValues = data.stream().map(kv -> kv.value.getValue()).collect(Collectors.toList());
+        List<String> dataFieldValues = data.stream().map(kv -> kv.value).collect(Collectors.toList());
         this.addRowToSheet(sheet, dataFieldValues);
 
         // write to file

src/main/java/com/damgem/DataImporter/Connector/AccessConnector.java

@@ -5,6 +5,7 @@
 import com.damgem.DataImporter.Connector.ExcelConnector;
 import com.damgem.DataImporter.DataImporterError;
 import com.damgem.DataImporter.Field.Field;
+import com.damgem.DataImporter.Field.NamedValue;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.PauseTransition;
@@ -35,6 +36,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class MainController implements Initializable {
     // FXML Stuff
@@ -62,6 +64,7 @@ public void setFields(List<Field> fields) {
             this.grid.add(new FieldName(f), 0, fi);
             FieldValue fv = new FieldValue(f, fi);
             this.grid.add(fv, 1, fi);
+
             if(!customSelection && f.value.getValue().isEmpty()){
                 customSelection = true;
                 fv.requestFocus();
@@ -104,25 +107,35 @@ public void importData() {
         this.disabled.setValue(true);
 
         boolean successful = false;
-        try {
-            dataConnector.write(this.target, this.subTarget, this.fields);
+        try
+        {
+            // extract namedValues from fields
+            List<NamedValue> namedValues = new ArrayList<>(fields.size());
+            for (Field field : fields)
+                namedValues.add(field.extractData());
+
+            // write data
+            dataConnector.write(target, subTarget, namedValues);
+
+            // mark operation as successful
             successful = true;
-        } catch (DataImporterError error) {
-            this.errorDialog(error.errorTitle, error.errorDescription);
+        }
+        catch (DataImporterError error) {
+            errorDialog(error.errorTitle, error.errorDescription);
         } catch (Throwable error) {
-            this.errorDialog("Internal Error", error.getMessage());
+            errorDialog("Internal Error", error.getMessage());
         }
 
         if(!successful) {
             PauseTransition pause = new PauseTransition(Duration.millis(250));
-            pause.setOnFinished(event -> this.disabled.setValue(false));
+            pause.setOnFinished(event -> disabled.setValue(false));
             pause.play();
         } else {
             ColorInput effect = new ColorInput(0, 0, 1000, 1000, Color.rgb(0,0,0, 0));
             Timeline fade = new Timeline(
                     new KeyFrame(Duration.millis(100), new KeyValue(effect.paintProperty(), Paint.valueOf("green")))
             );
-            this.grid.getScene().getRoot().setEffect(effect);
+            grid.getScene().getRoot().setEffect(effect);
             fade.setOnFinished(e -> this.closeWindow());
             fade.play();
         }
@@ -160,10 +173,10 @@ public void setDimensions(Integer width, Integer height, Integer keyColumnWidth)
 
     private class FieldName extends Label {
         FieldName(Field field) {
-            super(field.name);
-            if(field.isRequired) this.setStyle("-fx-font-weight: bold");
+            super(field.blueprint.name);
+            if(field.blueprint.isRequired) this.setStyle("-fx-font-weight: bold");
             this.disableProperty().bind(disabled);
-            this.setTooltip(new Tooltip(field.name));
+            this.setTooltip(new Tooltip(field.blueprint.name));
         }
     }