From 42c9de86d10005b28c9ea39903c2d923c1f36fae Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Mon, 3 Feb 2020 14:43:06 +0100 Subject: [PATCH] envs for uuid configuration --- hastur-env.sh | 9 +++++++++ src/wanijo/public/db.clj | 24 ++++++++++++++++-------- src/wanijo/public/view.clj | 29 +++++++++++++++-------------- 3 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 hastur-env.sh diff --git a/hastur-env.sh b/hastur-env.sh new file mode 100644 index 0000000..d7487c1 --- /dev/null +++ b/hastur-env.sh @@ -0,0 +1,9 @@ +export SCHEMA_COC=f0dae806-c82e-4ced-a39e-c7aef5442579 +export SCHEMA_ROLE=ef886398-44b5-4241-a391-bf07a5c92ef0 +export SCHEMA_LEVEL=67bc62b7-77da-4a4e-9cdd-eeaa3061d0ee +export SCHEMA_MODULE=fbf30747-2fd3-4479-8e5b-e03b4509554b +export SCHEMA_COMPONENT=f229b8c7-3794-4ded-8192-052dd7af3830 + +export INST_DEV=73f69c1b-5106-44bb-b5e1-90c4f3847037 +export INST_REQ=1d155970-f211-4699-9b90-21ef748c6afd +export INST_PRK=46dfa4e3-4223-4e76-9fb1-2fbdcec15f74 diff --git a/src/wanijo/public/db.clj b/src/wanijo/public/db.clj index d9a47f2..9ecea5f 100644 --- a/src/wanijo/public/db.clj +++ b/src/wanijo/public/db.clj @@ -2,16 +2,24 @@ (:require [wanijo.infrastructure.neo4j :as neo4j])) (def schema-uuids - {:coc "4f7b561c-51d2-4332-895f-cd583946dcab" - :role "f87b5810-b8c2-4420-91ae-87f0e02af88a" - :level "4ce60c8f-3864-4528-9e63-7c862cb8644a" - :module "574b1813-5366-4e48-9034-9c1bce52d455" - :component "439856be-85be-49c1-b58b-4594741f37b3"}) + {:coc (or (System/getenv "SCHEMA_COC") + "4f7b561c-51d2-4332-895f-cd583946dcab") + :role (or (System/getenv "SCHEMA_ROLE") + "f87b5810-b8c2-4420-91ae-87f0e02af88a") + :level (or (System/getenv "SCHEMA_LEVEL") + "4ce60c8f-3864-4528-9e63-7c862cb8644a") + :module (or (System/getenv "SCHEMA_MODULE") + "574b1813-5366-4e48-9034-9c1bce52d455") + :component (or (System/getenv "SCHEMA_COMPONENT") + "439856be-85be-49c1-b58b-4594741f37b3")}) (def coc-instance-uuids - {"dev" "6348f1ab-1771-4bef-b101-eb76ec236646" - "req" "44b02979-7e78-491c-8631-fc49a47b799d" - "prk" "318ee72d-8a8b-42c5-aa90-d5efc1787d22"}) + {"dev" (or (System/getenv "INST_DEV") + "6348f1ab-1771-4bef-b101-eb76ec236646") + "req" (or (System/getenv "INST_REQ") + "44b02979-7e78-491c-8631-fc49a47b799d") + "prk" (or (System/getenv "INST_PRK") + "318ee72d-8a8b-42c5-aa90-d5efc1787d22")}) (neo4j/defquery roles-with-levels-of-coc "MATCH (coc:instance {uuid:{coc_uuid}}), diff --git a/src/wanijo/public/view.clj b/src/wanijo/public/view.clj index 6181fa0..da4ccd2 100644 --- a/src/wanijo/public/view.clj +++ b/src/wanijo/public/view.clj @@ -55,22 +55,23 @@ (layout [[:main.main [:h1 "CoC " (h (:name coc))] - [:table.table - [:thead - [:tr - [:th "Rolle"] - [:th "Erfahrungsstufe"]]] - [:tbody - (for [row roles-with-levels - :let [{:keys [role levels]} row - rest-levels (rest levels)]] - (list - [:tr + [:div.table-responsive + [:table.table + [:thead + [:tr + [:th "Rolle"] + [:th "Erfahrungsstufe"]]] + [:tbody + (for [row roles-with-levels + :let [{:keys [role levels]} row + rest-levels (rest levels)]] + (list + [:tr [:td {:rowspan (max 1 (count levels))} (h (:name role))] [:td (h (-> levels first :name))]] - (for [level rest-levels] - [:tr - [:td (h (:name level))]])))]]] + (for [level rest-levels] + [:tr + [:td (h (:name level))]])))]]]] [:nav [:ol.breadcrumb [:li.breadcrumb-item