Generate schedule in new sheet each time

The update also simplifies the custom menu logic. Validation was moved to the
Advanced menu, and the option to re-generate an existing schedule sheet was
removed (there should be no need to do that).

Author: tidoust

tools/appscript/add-custom-menu.mjs

@@ -10,16 +10,15 @@ export default function () {
     .addSubMenu(
       SpreadsheetApp.getUi()
         .createMenu('Manage the schedule')
-        .addItem('Validate metadata and existing schedule', 'validateGrid')
-        .addItem('Validate metadata and propose a new schedule', 'proposeGrid')
+        .addItem('Propose a new schedule', 'proposeGrid')
         .addItem('Apply current schedule sheet', 'applySchedule')
-        .addItem('Refresh table view of schedule', 'generateGrid')
     )
     .addItem('Publish the schedule and calendar', 'exportGrid')
     .addSeparator()
     .addSubMenu(
       SpreadsheetApp.getUi()
         .createMenu('Advanced')
+        .addItem('Validate metadata and existing schedule', 'validateGrid')
         .addItem('Retrieve latest published schedule (from GitHub)', 'importGrid')
         .addItem('Fetch event info, rooms, days, slots (from GitHub)', 'importMetadata')
         .addItem('Export event to files (HTML, JSON)', 'exportEventToFiles')

tools/appscript/generate-grid.mjs

@@ -1,12 +1,26 @@
 import { groupSessionMeetings } from '../../common/meetings.mjs';
+import { Srand } from '../../common/jsrand.mjs';
 
 /**
  * Fill the grid in the provided spreadsheet
  */
 export function fillGridSheet(spreadsheet, project, validationErrors) {
-  const sheet = spreadsheet.insertSheet('Grid', spreadsheet.getSheets().length - 1);
-    project.sheets.grid.sheet = sheet;
+  let gridVersion = Math.max(
+    ...spreadsheet.getSheets()
+      .map(sheet => sheet.getName())
+      .filter(name => name.match(/^Schedule v(\d+)$/))
+      .map(name => name.match(/^Schedule v(\d+)$/)[1])
+      .map(nb => parseInt(nb))
+  );
+  if (gridVersion === -Infinity) {
+    gridVersion = 0;
   }
+  gridVersion += 1;
+
+  const sheet = spreadsheet.insertSheet(
+    'Schedule v' + gridVersion,
+    spreadsheet.getSheets().length
+  );
   console.log('- clear sheet');
   sheet.clear();
   console.log('- attach result as metadata');
@@ -27,19 +41,17 @@ export function fillGridSheet(spreadsheet, project, validationErrors) {
   addSessions(sheet, project, validationErrors);
   console.log('- add borders');
   addBorders(sheet, project);
-  fillGridValidationSheet(spreadsheet, project, validationErrors);
+  fillGridValidationSheet(spreadsheet, project, gridVersion, validationErrors);
 }
 
 /**
  * Fill the grid validation sheet
  */
-function fillGridValidationSheet(spreadsheet, project, validationErrors) {
-  let sheet = project.sheets.gridValidation.sheet;
-  if (!sheet) {
-    sheet = spreadsheet.insertSheet('Grid validation',
-      spreadsheet.getSheets().length - 1);
-    project.sheets.gridValidation.sheet = sheet;
-  }
+function fillGridValidationSheet(spreadsheet, project, gridVersion, validationErrors) {
+  const sheet = spreadsheet.insertSheet(
+    `Schedule v${gridVersion} issues`,
+    spreadsheet.getSheets().length
+  );
   console.log('- clear grid validation sheet');
   sheet.clear();
 

tools/appscript/lib/schedule.mjs

@@ -16,7 +16,6 @@
 
 import _createOnOpenTrigger from './create-onopen-trigger.mjs';
 import _addTPACMenu from './add-custom-menu.mjs';
-import _generateGrid from './generate-grid.mjs';
 import _validateGrid from './validate-grid.mjs';
 import _proposeGrid from './propose-grid.mjs';
 import _exportGrid from './export-grid.mjs';
@@ -30,7 +29,6 @@ import _applySchedule from './apply-schedule.mjs';
 
 function main() { _createOnOpenTrigger(); }
 function addTPACMenu() { _addTPACMenu(); }
-function generateGrid() { _generateGrid(); }
 function validateGrid() { _validateGrid(); }
 function proposeGrid() { _proposeGrid(); }
 function exportGrid() { _exportGrid(); }

tools/appscript/main.mjs

@@ -1,7 +1,5 @@
-import {
-  getProject, refreshProject, saveSessionValidationInSheet
-} from './lib/project.mjs';
 import reportError from './lib/report-error.mjs';
+import { getProject } from './lib/project.mjs';
 import { fillGridSheet } from './lib/schedule.mjs';
 import { fetchMapping } from './lib/w3cid-map.mjs';
 import { suggestSchedule } from '../common/schedule.mjs';
@@ -43,18 +41,12 @@ async function proposeGrid(spreadsheet) {
       error.type !== 'irc');
     const validSessions = project.sessions.filter(s =>
       !errors.find(error => error.number === s.number));
+    const invalidSessions = project.sessions.filter(s =>
+      errors.find(error => error.number === s.number));
     project.sessions
       .filter(s => errors.find(error => error.number === s.number))
       .forEach(s => s.blockingError = true);
     console.log(`- found ${validSessions.length} valid sessions among them: ${validSessions.map(s => s.number).join(', ')}`);
-    for (const change of changes) {
-      console.warn(`- save validation problems for session ${change.number}`);
-      const session = project.sessions.find(s => s.number === change.number);
-      session.validation.error = change.validation.error;
-      session.validation.warning = change.validation.warning;
-      session.validation.check = change.validation.check;
-      await saveSessionValidationInSheet(session, project);
-    }
     console.log(`Validate sessions... done`);
 
     console.log(`Prepare parameters...`);
@@ -114,7 +106,7 @@ async function proposeGrid(spreadsheet) {
     console.log(`Compute new grid... done`);
 
     console.log(`Validate new grid...`);
-    const { errors: newErrors, changes: newChanges } = await validateGrid(project, { what: 'scheduling' })
+    let { errors: newErrors, changes: newChanges } = await validateGrid(project, { what: 'scheduling' })
     if (newErrors.length) {
       for (const error of newErrors) {
         console.warn(`- [${error.severity}: ${error.type}] #${error.session}: ${error.messages.join(', ')}`);
@@ -123,28 +115,34 @@ async function proposeGrid(spreadsheet) {
     else {
       console.log(`- looks good!`);
     }
-    for (const change of newChanges) {
-      console.warn(`- save validation problems for session ${change.number}`);
-      const session = project.sessions.find(s => s.number === change.number);
-      session.validation.error = change.validation.error;
-      session.validation.warning = change.validation.warning;
-      session.validation.check = change.validation.check;
-      await saveSessionValidationInSheet(session, project);
-    }
     console.warn(`Validate new grid... done`);
 
-    console.log('Update meeting info in sessions sheet...');
-    refreshProject(spreadsheet, project, { what: 'grid' });
-    console.log('Update meeting info in sessions sheet... done');
-
     console.log('Report new grid in grid sheet...');
+    if (invalidSessions.length > 0) {
+      newErrors = invalidSessions
+        .map(session => errors.filter(error => error.number === s.number))
+        .flat()
+        .concat(newErrors);
+    }
+    if (noschedule.length > 0) {
+      newErrors = validSessions
+        .filter(session =>
+          !session.meetings ||
+          session.meetings.length === 0 ||
+          session.meetings.find(m => !(m.room && m.day && m.slot)))
+        .map(session => Object.assign({
+          severity: 'error',
+          type: 'conflict',
+          session: session.number,
+          messages: ['Session could not be scheduled due to unresolvable conflicts']
+        }))
+        .concat(newErrors);
+    }
     fillGridSheet(spreadsheet, project, newErrors);
     console.log('Report new grid in grid sheet... done');
 
     console.log('Report results to user...');
     let msg = `<p>Spreadsheet updated with a new schedule proposal.</p>`;
-    const invalidSessions = project.sessions.filter(s =>
-      errors.find(error => error.number === s.number));
     if (invalidSessions.length > 0) {
       msg += `<p>
           I could not schedule the following sessions because they are invalid: