jsgantt-improved 2.8.9 → 3.0.0

package/dist-e2e/issue68-working-days.spec.js

@@ -0,0 +1,105 @@
+"use strict";
+/**
+ * E2E tests for issue #68: configurable working days.
+ *
+ * Verifies that setWorkingDays() causes getDuration() to count only
+ * working days, and that the default (all days working) is unchanged.
+ *
+ * Test chart: day format, one task Mon 2025-01-06 → Mon 2025-01-13.
+ *
+ * Date arithmetic note: '2025-01-13' parses to local midnight, which always
+ * satisfies the getDuration midnight-check, so vTaskEnd is shifted +1 day to
+ * Jan 14. The effective span is therefore Jan 6 → Jan 14 (8 calendar days).
+ *   Calendar span (Jan 6–13):  8 days
+ *   Working days Mon–Fri (Jan 6–13): Mon 6,Tue 7,Wed 8,Thu 9,Fri 10,Mon 13 = 6 days
+ *   Working days Mon–Sat:            add Sat 11                              = 7 days
+ */
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const test_1 = require("@playwright/test");
+const BASE = ((_a = process.env.JSGANTT_E2E_BASE_URL) !== null && _a !== void 0 ? _a : 'http://localhost:8080').replace(/\/$/, '');
+const DEMO_URL = `${BASE}/demo.html`;
+/** Wait for JSGantt global and navigate to demo page. */
+async function gotoDemo(page) {
+    await page.goto(DEMO_URL, { waitUntil: 'load', timeout: 25000 });
+    await page.waitForFunction(() => typeof window.JSGantt !== 'undefined', { timeout: 15000 });
+}
+/**
+ * Inject a day-format Gantt with one task (Mon Jan 6 → Mon Jan 13 2025) into
+ * #embedded-Gantt with optional working-days configuration.
+ *
+ * @param workingDays  If supplied, passed to g.setWorkingDays(). Null = default (all days).
+ */
+async function mountDayGantt(page, workingDays = null) {
+    await page.evaluate((wd) => {
+        const container = document.getElementById('embedded-Gantt');
+        if (!container)
+            throw new Error('#embedded-Gantt not found');
+        container.innerHTML = '';
+        const g = new window.JSGantt.GanttChart(container, 'day');
+        g.setOptions({ vFormat: 'day', vFormatArr: ['Day'], vShowDur: 1 });
+        if (wd)
+            g.setWorkingDays(wd);
+        g.AddTaskItem(new window.JSGantt.TaskItem(1, 'Task A', '2025-01-06', // Monday
+        '2025-01-13', // Monday (midnight → effective end = Tue Jan 14 for duration calc)
+        'gtaskblue', '', 0, 'Me', 0, 0, 0, 1, '', '', '', g));
+        g.Draw();
+    }, workingDays);
+    await page.waitForSelector('#embedded-Gantt .gcharttable', { timeout: 10000 });
+    await page.waitForTimeout(300);
+}
+/** Read the text of the first .gduration cell. */
+async function getDurationText(page) {
+    return page.evaluate(() => {
+        const cell = document.querySelector('#embedded-Gantt .gduration div');
+        return cell ? cell.innerText.trim() : '';
+    });
+}
+/** Read the pixel width of the first task bar. */
+async function getBarWidth(page) {
+    return page.evaluate(() => {
+        const bar = document.querySelector('[id*="bardiv_"]');
+        return bar ? parseInt(bar.style.width || '0', 10) : 0;
+    });
+}
+test_1.test.describe('Issue #68 — working days duration', () => {
+    test_1.test.beforeEach(async ({ page }) => {
+        await gotoDemo(page);
+    });
+    (0, test_1.test)('default: all-days chart shows 8 calendar days', async ({ page }) => {
+        await mountDayGantt(page, null);
+        const dur = await getDurationText(page);
+        // Effective span Jan 6 → Jan 14 = 8 calendar days (midnight +1 day adjustment)
+        (0, test_1.expect)(parseInt(dur), `Expected 8 days, got "${dur}"`).toBe(8);
+    });
+    (0, test_1.test)('setWorkingDays Mon–Fri: duration shows 6 working days', async ({ page }) => {
+        await mountDayGantt(page, { 0: false, 1: true, 2: true, 3: true, 4: true, 5: true, 6: false });
+        const dur = await getDurationText(page);
+        // Mon 6, Tue 7, Wed 8, Thu 9, Fri 10, Mon 13 = 6 working days
+        (0, test_1.expect)(parseInt(dur), `Expected 6 working days, got "${dur}"`).toBe(6);
+    });
+    (0, test_1.test)('setWorkingDays Mon–Sat: duration shows 7 working days', async ({ page }) => {
+        await mountDayGantt(page, { 0: false, 1: true, 2: true, 3: true, 4: true, 5: true, 6: true });
+        const dur = await getDurationText(page);
+        // Mon 6, Tue 7, Wed 8, Thu 9, Fri 10, Sat 11, Mon 13 = 7 working days
+        (0, test_1.expect)(parseInt(dur), `Expected 7 working days, got "${dur}"`).toBe(7);
+    });
+    (0, test_1.test)('all-true vWorkingDays gives same duration as default', async ({ page }) => {
+        await mountDayGantt(page, null);
+        const defaultDur = await getDurationText(page);
+        // Re-mount with explicit all-true working days
+        await page.evaluate(() => {
+            const container = document.getElementById('embedded-Gantt');
+            container.innerHTML = '';
+            const g = new window.JSGantt.GanttChart(container, 'day');
+            g.setOptions({ vFormat: 'day', vFormatArr: ['Day'], vShowDur: 1 });
+            g.setWorkingDays({ 0: true, 1: true, 2: true, 3: true, 4: true, 5: true, 6: true });
+            g.AddTaskItem(new window.JSGantt.TaskItem(1, 'Task A', '2025-01-06', '2025-01-13', 'gtaskblue', '', 0, 'Me', 0, 0, 0, 1, '', '', '', g));
+            g.Draw();
+        });
+        await page.waitForTimeout(300);
+        const allTrueDur = await getDurationText(page);
+        (0, test_1.expect)(parseInt(allTrueDur), `all-true working days (${allTrueDur}) should equal default (${defaultDur})`).toBe(parseInt(defaultDur));
+    });
+});
+//# sourceMappingURL=issue68-working-days.spec.js.map

package/dist-e2e/issue68-working-days.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"issue68-working-days.spec.js","sourceRoot":"","sources":["../test/e2e/issue68-working-days.spec.ts"],"names":[],"mappings":"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"}

package/docs/index.js

@@ -54,8 +54,11 @@ function start(e) {
       vCaptionType: "Complete", // Set to Show Caption : None,Caption,Resource,Duration,Complete,
       vQuarterColWidth: 36,
       vDateTaskDisplayFormat: "day dd month yyyy", // Shown in tool tip box
-      vDayMajorDateDisplayFormat: "mon yyyy - Week ww", // Set format to display dates in the "Major" header of the "Day" view
-      vWeekMinorDateDisplayFormat: "dd mon", // Set format to display dates in the "Minor" header of the "Week" view
+      // {{token}} syntax (issue #382): text outside {{}} is treated as a literal label.
+      // "Week" and "week" stay as-is; only {{ww}}, {{mon}}, {{yyyy}} etc. are substituted.
+      vDayMajorDateDisplayFormat: "{{mon}} {{yyyy}} - Week {{ww}}", // "Week" is literal; {{ww}} → week number
+      vWeekMajorDateDisplayFormat: "{{yyyy}} - week {{ww}}",        // "week" is literal; legacy "week" token would give ISO date
+      vWeekMinorDateDisplayFormat: "{{dd}} {{mon}}",                // equivalent to legacy "dd mon" but explicit
       vLang: lang,
       vUseSingleCell, // Set the threshold at which we will only use one cell per table row (0 disables).  Helps with rendering performance for large charts.
       vShowRes,