Skip to content

Commit

Permalink
Merge pull request #3810 from finnishtransportagency/HARJA-1277
Browse files Browse the repository at this point in the history
HARJA-1277 Älä mergeä soluja, ettei tietoja katoaisi
  • Loading branch information
solita-staskila authored Jan 28, 2025
2 parents 33e70f3 + 35856f6 commit 29a7e4f
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions src/clj/harja/palvelin/raportointi/excel.clj
Original file line number Diff line number Diff line change
Expand Up @@ -305,22 +305,19 @@
(let [rivi (.createRow sheet (dec nolla))
solu (.createCell rivi 0)]
(excel/set-cell! solu nimi)
(excel/set-cell-style! solu raportin-tiedot-tyyli)
(.addMergedRegion sheet (CellRangeAddress. nolla nolla 0 20))))
(excel/set-cell-style! solu raportin-tiedot-tyyli)))

(defn- tee-sheet-otsikkoteksti [sheet rivinumero otsikkoteksti tyyli]
(let [rivi (.createRow sheet rivinumero)
solu (.createCell rivi 0)]
(excel/set-cell! solu otsikkoteksti)
(excel/set-cell-style! solu tyyli)
(.addMergedRegion sheet (CellRangeAddress. rivinumero rivinumero 0 20))))
(excel/set-cell-style! solu tyyli)))

(defn- tee-tekstirivi [sheet rivinumero teksti tyyli]
(let [rivi (.createRow sheet rivinumero)
solu (.createCell rivi 0)]
(excel/set-cell! solu teksti)
(excel/set-cell-style! solu tyyli)
(.addMergedRegion sheet (CellRangeAddress. rivinumero rivinumero 0 20))))
(excel/set-cell-style! solu tyyli)))

(defn- font-leipateksti
([] (font-leipateksti 11))
Expand Down

0 comments on commit 29a7e4f

Please sign in to comment.