From 457561f7b1baa6be21825de3c0a69eddbc96e956 Mon Sep 17 00:00:00 2001
From: Ivan Dymkov <mstrdymio@gmail.com>
Date: Fri, 20 May 2022 18:01:41 +0200
Subject: [PATCH] Update vitals form in zrc

---
 zrc/vitals.edn | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/zrc/vitals.edn b/zrc/vitals.edn
index 7f2550b..c3f7b5f 100644
--- a/zrc/vitals.edn
+++ b/zrc/vitals.edn
@@ -24,23 +24,29 @@
  {:zen/tags #{aidbox.sdc/Form}
   :document VitalsDocument
   :engine aidbox.sdc/Hiccup
-  :layout [:col
-           [:row [:field {:bind [:body-temperature]}]]
-           [:row [:group {:label "Blood pressure"}
-                  [:block
-                   [:field {:bind [:brach-a-l-bp-sys]}]
-                   [:field {:bind [:brach-a-l-bp-dias]}]
-                   ]
-                  [:block
-                   [:field {:bind [:brach-a-r-bp-sys]}]
-                   [:field {:bind [:brach-a-r-bp-dias]}]
-                   ]
-                  ]]
-           [:row [:field {:bind [:heart-rate] :label "Pulse Rate"}]]
-           [:row [:field {:bind [:resp-rate]}]]
-           [:row [:field {:bind [:sao2-%-blda-pulseox]}]]
-           [:row [:field {:bind [:weight]}]]
-           [:row [:field {:bind [:body-height]}]]]}
+  :layout [:form
+   [:header "Vitals"]
+   [:field {:bind [:body-temperature], :label "Temperature", :unit "F"}]
+   [:field
+    {:type "double"
+     :bind [:blood-pressure-dias :blood-pressure-sys]
+     :label "Blood Pressure"
+     :unit "mmHg"}]
+   [:row
+    [:label "Blood Pressure"]
+    [:input {:bind [:blood-pressure-dias]}]
+    [:input {:bind [:blood-pressure-sys]}]]
+   [:field {:bind [:heart-rate], :label "Pulse Rate", :unit "bpm"}]
+   [:field {:bind [:resp-rate], :label "Respiratory rate", :unit "bpm"}]
+   [:field
+    {:bind [:sao2-%-blda-pulseox]
+     :label "Oxygen saturation"
+     :unit "%SpO2"}]
+   [:field {:bind [:weight], :label "Weight", :unit "lbs"}]
+   [:field {:bind [:body-height], :label "Height"}]
+   [:field {:bind [:bmi], :label "BMI"}]
+  ]
+ }
 
  VitalsLaunch
  {:zen/tags #{aidbox.sdc/Launch}