Time-To-Leave-481

README.md

@@ -30,7 +30,6 @@
 <a href="docs/README-th-TH.md"><img src="https://img.shields.io/badge/th--TH-ภาษาไทย-purple" alt="เอกสารฉบับนี้มีให้บริการในรูปแบบภาษาไทย"></a>
 <a href="docs/README-tr-TR.md"><img src="https://img.shields.io/badge/tr-T%C3%BCrk%C3%A7e-purple" alt="Bu belge Türkçe olarak da mevcuttur"></a>
 <a href="docs/README-uk-UA.md"><img src="https://img.shields.io/badge/uk--UA-Українська-purple" alt="Документація додатку українською"></a>
-<a href="docs/README-zh-CN.md"><img src="https://img.shields.io/badge/zh--CN-简体中文-purple" alt="此文档亦适用于简体中文"></a>
 <a href="docs/README-zh-TW.md"><img src="https://img.shields.io/badge/zh--TW-繁體中文-purple" alt="此文檔亦適用於繁體中文"></a>
 <br/>
 

__tests__/__main__/import-export.js

@@ -46,6 +46,7 @@ describe('Import export', function()
     const store = new Store();
     const flexibleStore = new Store({name: 'flexible-store'});
     const waivedWorkdays = new Store({name: 'waived-workdays'});
+    const workdayStore = new Store({name: 'temp-workdays'});
 
     // TODO: Regular store is still here to test migration of dbs. Please remove on the next release.
     store.clear();

__tests__/__main__/user-preferences.js

@@ -504,7 +504,6 @@ describe('Preferences Main', () =>
             assert.strictEqual(getLanguageName('th-TH'), 'ไทย');
             assert.strictEqual(getLanguageName('tr-TR'), 'Türkçe');
             assert.strictEqual(getLanguageName('uk-UA'), 'Українська');
-            assert.strictEqual(getLanguageName('zh-CN'), '简体中文');
             assert.strictEqual(getLanguageName('zh-TW'), '繁體中文');
         });
     });

__tests__/__renderer__/classes/BaseCalendar.js

@@ -53,6 +53,8 @@ describe('BaseCalendar.js', () =>
         flexibleStore.clear();
         const waivedWorkdays = new Store({name: 'waived-workdays'});
         waivedWorkdays.clear();
+        const workdayStore = new Store({name: 'temp-workdays'});
+        workdayStore.clear();
         ExtendedClass.prototype._initCalendar = () => {};
         ExtendedClass.prototype._getTargetDayForAllTimeBalance = () => {};
 
@@ -70,6 +72,13 @@ describe('BaseCalendar.js', () =>
                 resolve(waivedWorkdays.store);
             });
         };
+        window.mainApi.getWorkdayStoreContents = () =>
+        {
+            return new Promise((resolve) =>
+            {
+                resolve(workdayStore.store);
+            });
+        };
         window.mainApi.setFlexibleStoreData = (key, contents) =>
         {
             flexibleStore.set(key, contents);

__tests__/__renderer__/workday-waiver.js

@@ -10,6 +10,7 @@ const Holidays = require('date-holidays');
 window.$ = require('jquery');
 const {
     addWaiver,
+    addWorkday,
     populateList,
     setDates,
     setHours,
@@ -48,6 +49,7 @@ jest.mock('../../renderer/i18n-translator.js', () => ({
 }));
 
 const waiverStore = new Store({name: 'waived-workdays'});
+const workdayStore = new Store({name: 'temp-workdays'});
 
 // APIs from the preload script of the workday waiver window
 window.mainApi = workdayWaiverApi;
@@ -72,6 +74,26 @@ window.mainApi.deleteWaiver = (key) =>
     });
 };
 
+// Mocking with the actual access to store that main would have
+window.mainApi.getWorkdayStoreContents = () => { return new Promise((resolve) => resolve(workdayStore.store)); };
+window.mainApi.setWorkday = (key, contents) =>
+{
+    return new Promise((resolve) =>
+    {
+        workdayStore.set(key, contents);
+        resolve(true);
+    });
+};
+window.mainApi.hasWorkday= (key) => { return new Promise((resolve) => resolve(workdayStore.has(key))); };
+window.mainApi.deleteWorkday = (key) =>
+{
+    return new Promise((resolve) =>
+    {
+        workdayStore.delete(key);
+        resolve(true);
+    });
+};
+
 window.mainApi.getHolidays = (country, state, city, year) =>
 {
     return new Promise((resolve) =>
@@ -127,6 +149,7 @@ const languageData = {'language': 'en', 'data': {'dummy_string': 'dummy_string_t
 async function prepareMockup()
 {
     waiverStore.clear();
+    workdayStore.clear();
     const workdayWaiverHtml = path.join(__dirname, '../../src/workday-waiver.html');
     const content = fs.readFileSync(workdayWaiverHtml);
     const parser = new DOMParser();

changelog.md

@@ -13,7 +13,6 @@
 -   Fix [#1042]: Removing extra space at bottom of workday waiver window
 -   Fix [#1044]: Introduce Content Security Policies to app's pages
 -   Fix [#1047]: Fixing test issues in CI
--   Translation: Time to Leave is now available in Simplified Chinese (zh-CN)!
 
 <!--- End changes - Do not remove -->
 
@@ -27,7 +26,6 @@ Who built 3.0.1:
 -   araujoarthur0
 -   chase-west
 -   gsriram24
--   nh1000
 -   ochan12
 -   pallasite99
 -   tupaschoal

css/styles.css

@@ -745,6 +745,20 @@ input:disabled + .slider {
   color: var(--punch-disable-bground);
 }
 
+#workday-waiver-window .add-workday-button {
+  opacity: 0.9;
+  width: 100%;
+  height: 24px;
+  border: none;
+  color: var(--punch-color);
+  background-color: var(--punch-bground);
+}
+
+#workday-waiver-window .add-workday-button:disabled {
+  opacity: 0.5;
+  color: var(--punch-disable-bground);
+}
+
 #workday-waiver-window #waiver-list-table,
 #workday-waiver-window #holiday-list-table {
   width: 100%;

js/import-export.js

@@ -54,6 +54,28 @@ function _getWaivedEntries()
     return output;
 }
 
+/**
+ * Returns the database (only waived workday entries) as an array of:
+ *   . type: workday
+ *   . date
+ *   . data: (reason)
+ */
+function _getWorkdayEntries()
+{
+    const workdayStore = new Store({name: 'temp-workdays'});
+    const output = [];
+    for (const entry of workdayStore)
+    {
+        const date = entry[0];
+        const reason = entry[1]['reason'];
+        const hours = entry[1]['hours'];
+
+        //The waived workday database uses human month index (1-12)
+        output.push({'type': 'waived', 'date': date, 'data': reason, 'hours': hours});
+    }
+    return output;
+}
+
 function exportDatabaseToFile(filename)
 {
     let information = _getFlexibleEntries();