From 17cd38694a0d0f478d9017e8be9268d43bffef7e Mon Sep 17 00:00:00 2001
From: Jerry Padgett <sjpadgett@gmail.com>
Date: Thu, 14 Oct 2021 19:59:03 -0400
Subject: [PATCH] Add exam test title column to data type 23 (#4683)

* Add exam test title column to data type 23
adjust LBF History row/columns for upgrades

* container row to 100vw
---
 interface/forms/LBF/new.php    | 3 ++-
 library/options.inc.php        | 7 ++++---
 sql/6_0_0-to-6_1_0_upgrade.sql | 5 +++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/interface/forms/LBF/new.php b/interface/forms/LBF/new.php
index ef45c9163..a017d8e47 100644
--- a/interface/forms/LBF/new.php
+++ b/interface/forms/LBF/new.php
@@ -884,7 +884,8 @@ if (
             "onsubmit='return validate(this)'>\n";
         ?>
         <!-- row width will size to col content width -->
-        <div class="row">
+        <!-- We need all possible viewport width sjp w-100 -->
+        <div class="row w-100">
             <div class="col-12">
                 <?php
                 $cmsportal_login = '';
diff --git a/library/options.inc.php b/library/options.inc.php
index 32b53f397..816d227a1 100644
--- a/library/options.inc.php
+++ b/library/options.inc.php
@@ -1133,8 +1133,8 @@ function generate_form_field($frow, $currvalue)
         $lres = sqlStatement("SELECT * FROM list_options " .
         "WHERE list_id = ? AND activity = 1 ORDER BY seq, title", array($list_id));
         echo "<table class='table'>";
-        echo "<tr><td>&nbsp;</td><td class='font-weight-bold'>" .
-        htmlspecialchars(xl('N/A'), ENT_NOQUOTES) .
+        echo "<tr><td class='font-weight-bold'>" . htmlspecialchars(xl('Exam or Test'), ENT_NOQUOTES) .
+        "</td><td class='font-weight-bold'>" . htmlspecialchars(xl('N/A'), ENT_NOQUOTES) .
         "&nbsp;</td><td class='font-weight-bold'>" .
         htmlspecialchars(xl('Nor'), ENT_NOQUOTES) . "&nbsp;</td>" .
         "<td class='font-weight-bold'>" .
@@ -2014,7 +2014,8 @@ function generate_print_field($frow, $currvalue, $value_allowed = true)
         $lres = sqlStatement("SELECT * FROM list_options " .
         "WHERE list_id = ? AND activity = 1 ORDER BY seq, title", array($list_id));
         echo "<table class='table'>";
-        echo "<tr><td>&nbsp;</td><td class='font-weight-bold'>" .
+        echo "<tr><td><td class='font-weight-bold'>" .
+        htmlspecialchars(xl('Exam or Test'), ENT_NOQUOTES) . "</td><td class='font-weight-bold'>" .
         htmlspecialchars(xl('N/A'), ENT_NOQUOTES) .
         "&nbsp;</td><td class='font-weight-bold'>" .
         htmlspecialchars(xl('Nor'), ENT_NOQUOTES) . "&nbsp;</td>" .
diff --git a/sql/6_0_0-to-6_1_0_upgrade.sql b/sql/6_0_0-to-6_1_0_upgrade.sql
index f4073e62d..ab3ec1759 100644
--- a/sql/6_0_0-to-6_1_0_upgrade.sql
+++ b/sql/6_0_0-to-6_1_0_upgrade.sql
@@ -1087,3 +1087,8 @@ INSERT INTO `code_types` (`ct_key`, `ct_id`, `ct_seq`, `ct_mod`, `ct_just`, `ct_
     ('VALUESET', (SELECT MAX(`id`) FROM `temp_table_one`), (SELECT MAX(`seq`) FROM `temp_table_one`), '0', '', '', '1', '1', '0', '1', '1', 'CQM Valueset', '13', '1', '1', '1', '1', '1');
 DROP TABLE `temp_table_one`;
 #EndIf
+
+#IfNotRow4D layout_options form_id HIS field_id exams titlecols 1 datacols 3
+UPDATE `layout_options` SET `title` = 'Exams/Tests', `titlecols` = '1', `datacols` = '3' WHERE `layout_options`.`form_id` = 'HIS' AND `layout_options`.`field_id` = 'exams';
+UPDATE `layout_options` SET `titlecols` = '1', `datacols` = '3' WHERE `layout_options`.`form_id` = 'HIS' AND `layout_options`.`field_id` = 'usertext11';
+#EndIf
-- 
2.11.4.GIT