From 6acc26a4147de71d6072b214250c84cced26105b Mon Sep 17 00:00:00 2001
From: "John R. D'Orazio" <priest@johnromanodorazio.com>
Date: Mon, 29 Apr 2024 03:32:47 +0200
Subject: [PATCH] FormControls clean up output from whitespace and newlines

---
 assets/js/FormControls.js | 6 +++---
 assets/js/extending.js    | 9 ++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/assets/js/FormControls.js b/assets/js/FormControls.js
index adc7d4c7..6ab1f90f 100644
--- a/assets/js/FormControls.js
+++ b/assets/js/FormControls.js
@@ -107,7 +107,7 @@ class FormControls {
         formRow += `</div>`;
         ++FormControls.uniqid;
 
-        return formRow;
+        return formRow.replaceAll('    ','').replace(/(?:\r\n|\r|\n)/g,'');
     }
 
     static CreatePatronRow(element = null) {
@@ -266,7 +266,7 @@ class FormControls {
         formRow += `</div>`;
         ++FormControls.uniqid;
 
-        return formRow;
+        return formRow.replaceAll('    ','').replace(/(?:\r\n|\r|\n)/g,'');
     }
 
     static CreateDoctorRow(element = null) {
@@ -444,7 +444,7 @@ class FormControls {
         formRow += `</div>`;
         ++FormControls.uniqid;
 
-        return formRow;
+        return formRow.replaceAll('    ','').replace(/(?:\r\n|\r|\n)/g,'');
     }
 
 }
diff --git a/assets/js/extending.js b/assets/js/extending.js
index 88ebbb38..adde99e6 100644
--- a/assets/js/extending.js
+++ b/assets/js/extending.js
@@ -684,9 +684,6 @@ $(document).on('click', '.actionPromptButton', ev => {
 
     if( existingFestivityTag !== '' ) {
         rowStr = FormControls.CreatePatronRow( existingFestivityTag );
-        rowStr = rowStr.replaceAll('    ','');
-        rowStr = rowStr.replace(/(?:\r\n|\r|\n)/g,'');
-        console.log(rowStr);
         rowEls = $.parseHTML(rowStr);
         $row = $( rowEls );
         console.log($row);
@@ -696,8 +693,6 @@ $(document).on('click', '.actionPromptButton', ev => {
         }
     } else {
         rowStr = FormControls.CreatePatronRow();
-        rowStr = rowStr.replaceAll('    ','');
-        rowStr = rowStr.replace(/(?:\r\n|\r|\n)/g,'');
         rowEls = $.parseHTML( rowStr );
         $row = $( rowEls );
     }
@@ -811,8 +806,8 @@ $(document).on('change', '.regionalNationalCalendarName', ev => {
                 }
 
                 let rowStr = FormControls.CreatePatronRow( el );
-                console.log(rowStr);
-                let $row = $(rowStr);
+                let rowEls = $.parseHTML(rowStr);
+                let $row = $(rowEls);
                 $('.regionalNationalDataForm').append($row);
 
                 let $formrow = $row.find('.form-group').closest('.row');