From e25523fb341a4bb06e8c01dd3b552207308d32c2 Mon Sep 17 00:00:00 2001
From: Tulio Leao <tupaschoal@gmail.com>
Date: Sun, 8 Oct 2023 08:09:32 -0300
Subject: [PATCH] Fix #1008: Sourced conflicting holidays being imported by
 default

---
 __tests__/__renderer__/workday-waiver.js | 6 +++---
 src/workday-waiver.js                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/__tests__/__renderer__/workday-waiver.js b/__tests__/__renderer__/workday-waiver.js
index e319d70e4..5f8afdde3 100644
--- a/__tests__/__renderer__/workday-waiver.js
+++ b/__tests__/__renderer__/workday-waiver.js
@@ -476,7 +476,7 @@ describe('Test Workday Waiver Window', function()
             const secondCell = table.find('td')[1].innerHTML;
             const thirdCell = table.find('td')[2].innerHTML;
             const fourthCell = table.find('td')[4].innerHTML;
-            const fourthCellContent = `<label class="switch"><input type="checkbox" checked="${conflicts || workingDay === 'No' ? '' : 'checked'}" name="import-${day}" id="import-${day}"><span class="slider round"></span></label>`;
+            const fourthCellContent = `<label class="switch"><input type="checkbox" checked="" name="import-${day}" id="import-${day}"><span class="slider round"></span></label>`;
             expect(firstCell).toBe(day);
             expect(secondCell).toBe(reason);
             expect(thirdCell).toBe('undefined');
@@ -497,7 +497,7 @@ describe('Test Workday Waiver Window', function()
             const secondCell = table.find('td')[1].innerHTML;
             const thirdCell = table.find('td')[2].innerHTML;
             const fourthCell = table.find('td')[4].innerHTML;
-            const fourthCellContent = `<label class="switch"><input type="checkbox" checked="${conflicts || workingDay === 'No' ? '' : 'checked'}" name="import-${day}" id="import-${day}"><span class="slider round"></span></label>`;
+            const fourthCellContent = `<label class="switch"><input type="checkbox" name="import-${day}" id="import-${day}"><span class="slider round"></span></label>`;
             expect(firstCell).toBe(day);
             expect(secondCell).toBe(reason);
             expect(thirdCell).toBe(workingDay);
@@ -519,7 +519,7 @@ describe('Test Workday Waiver Window', function()
             const thirdCell = table.find('td')[2].innerHTML;
             const conflictsCell = table.find('td')[3].innerHTML;
             const fourthCell = table.find('td')[4].innerHTML;
-            const fourthCellContent = `<label class="switch"><input type="checkbox" checked="${conflicts || workingDay === 'No' ? '' : 'checked'}" name="import-${day}" id="import-${day}"><span class="slider round"></span></label>`;
+            const fourthCellContent = `<label class="switch"><input type="checkbox" name="import-${day}" id="import-${day}"><span class="slider round"></span></label>`;
             expect(firstCell).toBe(day);
             expect(secondCell).toBe(reason);
             expect(thirdCell).toBe(workingDay);
diff --git a/src/workday-waiver.js b/src/workday-waiver.js
index 46cdee0f4..51105bfb1 100644
--- a/src/workday-waiver.js
+++ b/src/workday-waiver.js
@@ -314,7 +314,7 @@ function addHolidayToList(day, reason, workingDay, conflicts)
     if (conflicts)
         $(row.cells[3]).addClass('text-danger');
     conflictsCell.innerHTML = conflicts;
-    importCell.innerHTML = `<label class="switch"><input type="checkbox" checked="${conflicts || workingDay === 'No' ? '' : 'checked'}" name="import-${day}" id="import-${day}"><span class="slider round"></span></label>`;
+    importCell.innerHTML = `<label class="switch"><input type="checkbox" ${conflicts || workingDay === 'No' ? ' ' : 'checked=""'} name="import-${day}" id="import-${day}"><span class="slider round"></span></label>`;
 }
 
 function clearHolidayTable()