From 906b24f460a80d9f7b83fe7507caa47ca30911c2 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Sat, 3 Sep 2022 22:34:48 +0700 Subject: [PATCH] Update cetakan resep dokter Penerapan font dan perbaikan desain catakan A4 size 12 dan flag telaah peresepan --- jasamedika-reporting/pom.xml | 6 + .../WEB-INF/templates/jrxml/resep.jrxml | 978 +++++++++--------- .../templates/jrxml/resep_racikan.jrxml | 57 +- jasamedika-web/pom.xml | 2 +- 4 files changed, 557 insertions(+), 486 deletions(-) diff --git a/jasamedika-reporting/pom.xml b/jasamedika-reporting/pom.xml index e9481f0a..90afc0dc 100644 --- a/jasamedika-reporting/pom.xml +++ b/jasamedika-reporting/pom.xml @@ -203,6 +203,12 @@ jasperreports 6.11.0 + + + net.sf.jasperreports + jasperreports-fonts + 4.0.0 + org.apache.poi diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml index 82e80511..2cf06687 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml @@ -1,13 +1,11 @@ - + - - + + - - @@ -30,456 +28,438 @@ - + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - - + + + + + + + + + + + + + + + + @@ -488,25 +468,14 @@ - + - - - - - - - - - - - - + @@ -519,35 +488,120 @@ - + + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml index b8faa374..bc040c1d 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml @@ -1,6 +1,15 @@ - - + + + + + + + + + + + @@ -9,13 +18,15 @@ - + + - - + + + @@ -25,28 +36,28 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/jasamedika-web/pom.xml b/jasamedika-web/pom.xml index 75d19748..caba9e03 100644 --- a/jasamedika-web/pom.xml +++ b/jasamedika-web/pom.xml @@ -265,7 +265,7 @@ net.sf.jasperreports jasperreports-fonts - 6.20.0 + 4.0.0