Box Label UI same as the Sample (#1798)

instedd · Nov 29, 2022 · f2d8a96 · f2d8a96
1 parent f650cac
commit f2d8a96
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/app/views/boxes/_barcode_card.haml b/app/views/boxes/_barcode_card.haml
@@ -1,14 +1,23 @@
 .barcode-card.is-box
   .barcode-content
-    .barcode(style="float:right")
+    .barcode
       = image_tag barcode_svg_data_url(@box.uuid)
-
-    .title
-      = @box.institution.name
     .code
-      Box ID #{@box.uuid}
+      .uuid
+        #{@box.uuid}
+    .code
+      %strong
+        Box:
+      = @box.samples.count
+      samples
+    .code
+      %strong
+        Institution:
+      = @box.institution.name
     .code
-      Purpose: #{@box.purpose}
+      %strong
+        Purpose:
+      #{@box.purpose}
     .logo
       = image_tag 'cdx-logo-bw.png'
       .label https://cdx.io

diff --git a/app/views/boxes/barcode.pdf.haml b/app/views/boxes/barcode.pdf.haml
@@ -6,11 +6,11 @@
       .uuid
         #{box.uuid}
     .code
-      &nbsp;
+      Box: #{box.samples.count} samples
     .code
-      Purpose: #{box.purpose}
+      Institution: #{box.institution.name}
     .code
-      &nbsp;
+      Purpose: #{box.purpose}
     .logo
       = image_tag wicked_pdf_asset_base64('cdx-logo-bw.png')
       .label https://cdx.io
diff --git a/app/views/samples/_barcode_card.haml b/app/views/samples/_barcode_card.haml
@@ -19,7 +19,7 @@
     .code
       %strong
         Production Date:
-      #{@sample_form.date_produced}
+      #{@sample_form.date_produced.try{ strftime("%m/%d/%Y")}}
     .logo
       = image_tag 'cdx-logo-bw.png'
       .label https://cdx.io