From 48f2b598fb1bd1e3b19d0f69d3e1a11ef7ce5098 Mon Sep 17 00:00:00 2001
From: Toby Murray <toby@ksu.edu>
Date: Mon, 23 Oct 2017 23:10:45 -0500
Subject: [PATCH] Tweaking transformer presets

Title casing labels and adding the frequency field
---
 data/presets/fields/devices.json                | 2 +-
 data/presets/fields/frequency.json              | 6 ++++++
 data/presets/fields/phases.json                 | 2 +-
 data/presets/fields/transformer.json            | 4 ++--
 data/presets/fields/voltage/secondary.json      | 2 +-
 data/presets/fields/voltage/tertiary.json       | 2 +-
 data/presets/fields/windings.json               | 2 +-
 data/presets/fields/windings/configuration.json | 6 +++---
 data/presets/presets/power/transformer.json     | 1 +
 9 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 data/presets/fields/frequency.json

diff --git a/data/presets/fields/devices.json b/data/presets/fields/devices.json
index 0327c5878..95f33fa9e 100644
--- a/data/presets/fields/devices.json
+++ b/data/presets/fields/devices.json
@@ -1,6 +1,6 @@
 {
     "key": "devices",
     "type": "number",
-    "label": "Number of devices",
+    "label": "Number of Devices",
     "placeholder": "2"
 }
diff --git a/data/presets/fields/frequency.json b/data/presets/fields/frequency.json
new file mode 100644
index 000000000..a5460f8dc
--- /dev/null
+++ b/data/presets/fields/frequency.json
@@ -0,0 +1,6 @@
+{
+    "key": "frequency",
+    "type": "number",
+    "label": "Operating Frequency",
+    "placeholder": "50"
+}
diff --git a/data/presets/fields/phases.json b/data/presets/fields/phases.json
index c4f4cd2c9..0c7ae5c6b 100644
--- a/data/presets/fields/phases.json
+++ b/data/presets/fields/phases.json
@@ -1,6 +1,6 @@
 {
     "key": "phases",
     "type": "number",
-    "label": "Number of phases",
+    "label": "Number of Phases",
     "placeholder": "3"
 }
diff --git a/data/presets/fields/transformer.json b/data/presets/fields/transformer.json
index 6c5d18d03..b4f877ffc 100644
--- a/data/presets/fields/transformer.json
+++ b/data/presets/fields/transformer.json
@@ -1,7 +1,7 @@
 {
     "key": "transformer",
     "type": "combo",
-    "label": "Type of transformer",
+    "label": "Type of Transformer",
     "strings": {
         "options": {
             "distribution": "Distribution",
@@ -9,7 +9,7 @@
             "converter": "Converter",
             "traction": "Traction",
             "auto": "Autotransformer",
-            "phase_angle_regulator": "Phase angle regulator",
+            "phase_angle_regulator": "Phase Angle Regulator",
             "auxiliary": "Auxiliarty",
             "yes": "Unknown"
         }
diff --git a/data/presets/fields/voltage/secondary.json b/data/presets/fields/voltage/secondary.json
index f75b30c53..f0cf632e3 100644
--- a/data/presets/fields/voltage/secondary.json
+++ b/data/presets/fields/voltage/secondary.json
@@ -2,5 +2,5 @@
     "key": "voltage:secondary",
     "type": "number",
     "label": "Secondary Voltage",
-    "placeholder": "225000"
+    "placeholder": "400"
 }
\ No newline at end of file
diff --git a/data/presets/fields/voltage/tertiary.json b/data/presets/fields/voltage/tertiary.json
index 589c10a91..8e733d541 100644
--- a/data/presets/fields/voltage/tertiary.json
+++ b/data/presets/fields/voltage/tertiary.json
@@ -2,5 +2,5 @@
     "key": "voltage:tertiary",
     "type": "number",
     "label": "Tertiary Voltage",
-    "placeholder": "225000"
+    "placeholder": "20000"
 }
\ No newline at end of file
diff --git a/data/presets/fields/windings.json b/data/presets/fields/windings.json
index 1b641d7a9..7de9817dd 100644
--- a/data/presets/fields/windings.json
+++ b/data/presets/fields/windings.json
@@ -1,6 +1,6 @@
 {
     "key": "windings",
     "type": "number",
-    "label": "Number of windings",
+    "label": "Number of Windings",
     "placeholder": "3"
 }
diff --git a/data/presets/fields/windings/configuration.json b/data/presets/fields/windings/configuration.json
index e5806da47..7b682d4b7 100644
--- a/data/presets/fields/windings/configuration.json
+++ b/data/presets/fields/windings/configuration.json
@@ -1,13 +1,13 @@
 {
     "key": "windings:configuration",
     "type": "combo",
-    "label": "Windings configuration",
+    "label": "Windings Configuration",
     "strings": {
         "options": {
             "star": "Star",
             "delta": "Delta",
-            "open-delta": "Open delta",
-            "zigzag": "Zig zag",
+            "open-delta": "Open Delta",
+            "zigzag": "Zig Zag",
             "open": "Open",
             "scott": "Scott",
             "leblanc": "Leblanc"
diff --git a/data/presets/presets/power/transformer.json b/data/presets/presets/power/transformer.json
index 2f2a3e8a6..303eeb10a 100644
--- a/data/presets/presets/power/transformer.json
+++ b/data/presets/presets/power/transformer.json
@@ -4,6 +4,7 @@
         "transformer",
         "location",
         "phases",
+        "frequency",
         "voltage/primary",
         "voltage/secondary",
         "voltage/tertiary",