Browse Source

basic display values functionality

Brandon Wong 4 years ago
parent
commit
4fb1b6ab94
2 changed files with 4 additions and 10 deletions
  1. 2 2
      frontend/public/css/site.css
  2. 2 8
      frontend/src/microtables_frontend/core.cljs

+ 2 - 2
frontend/public/css/site.css

@@ -43,11 +43,11 @@ td, th {
 }
 th {
     text-align: center;
-    width: 40px;
+    min-width: 40px;
 }
 td {
     text-align: right;
-    width: 100px;
+    min-width: 100px;
 }
 
 td input {

+ 2 - 8
frontend/src/microtables_frontend/core.cljs

@@ -6,23 +6,16 @@
 ;for(let i = 0, s = new Set(); i < 10; i++){ let r = Math.floor(Math.random() * 15)+1, c = a[Math.floor(Math.random() * a.length)], k = `${c}${r}`; if(s.has(k)){ i--; continue; } s.add(k); v.push(`{:row ${r} :col "${c}" :value "${Math.floor(Math.random() * 10000)}"}`); }
 (def sample-data [{:row 1 :col "A" :value "59"}
                   {:row 5 :col "C" :value "269"}
-                  {:row 5 :col "H" :value "2001"}
                   {:row 4 :col "B" :value "7893"}
-                  {:row 8 :col "K" :value "8291"}
-                  {:row 8 :col "H" :value "755"}
                   {:row 2 :col "F" :value "8650"}
                   {:row 6 :col "D" :value "4065"}
-                  {:row 10 :col "G" :value "788"}
                   {:row 7 :col "F" :value "5316"}
-                  {:row 15 :col "G" :value "8599"}
                   {:row 1 :col "A" :value "4910"}
                   {:row 12 :col "A" :value "2405"}
-                  {:row 14 :col "H" :value "7292"}
                   {:row 5 :col "B" :value "7863"}
                   {:row 9 :col "E" :value "3144"}
                   {:row 10 :col "D" :value "8272"}
                   {:row 2 :col "F" :value "3013"}
-                  {:row 12 :col "G" :value "9411"}
                   {:row 11 :col "D" :value "2495"}
                   {:row 15 :col "E" :value "8968"}])
 
@@ -42,7 +35,8 @@
 ;; Views
 
 (defn cell [c r data]
-  ^{:key (str c r)} [:td (str c r)]
+  (let [datum (some #(if (and (= c (:col %)) (= r (:row %))) %) data)]
+    ^{:key (str c r)} [:td (or (:value datum) "")])
   )
 (defn row [r cols data]
   ^{:key (str "row-" r)} [:tr