From 7545f6f7d09853977b2d1d647b642e0a70a1c5f3 Mon Sep 17 00:00:00 2001 From: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Date: Sat, 16 Sep 2023 15:24:23 +0200 Subject: [PATCH 1/2] refactor: clarify description import (#526) --- apps/server/src/utils/parser.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/server/src/utils/parser.ts b/apps/server/src/utils/parser.ts index 61e944eb2..260bab21b 100644 --- a/apps/server/src/utils/parser.ts +++ b/apps/server/src/utils/parser.ts @@ -70,8 +70,9 @@ export const parseExcel = async (excelData) => { excelData .filter((e) => e.length > 0) .forEach((row) => { - let eventTitleNext = false; + // project data imports are on the column to the right let projectTitleNext = false; + let projectDescriptionNext = false; let publicUrlNext = false; let publicInfoNext = false; let backstageUrlNext = false; @@ -81,12 +82,12 @@ export const parseExcel = async (excelData) => { row.forEach((column, j) => { // check flags - if (eventTitleNext) { + if (projectTitleNext) { projectData.title = column; - eventTitleNext = false; - } else if (projectTitleNext) { - projectData.description = column; projectTitleNext = false; + } else if (projectDescriptionNext) { + projectData.description = column; + projectDescriptionNext = false; } else if (publicUrlNext) { projectData.publicUrl = column; publicUrlNext = false; @@ -159,10 +160,10 @@ export const parseExcel = async (excelData) => { // need to make sure it is a string first switch (col) { case 'project name': - eventTitleNext = true; + projectTitleNext = true; break; case 'project description': - projectTitleNext = true; + projectDescriptionNext = true; break; case 'public url': publicUrlNext = true; From e2aabe36468057b9ee4febc7b389a64a0d1b2f44 Mon Sep 17 00:00:00 2001 From: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Date: Sun, 17 Sep 2023 15:04:55 +0200 Subject: [PATCH 2/2] chore: version bump (#528) --- apps/client/package.json | 2 +- apps/electron/package.json | 2 +- apps/server/package.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/client/package.json b/apps/client/package.json index 439489ae7..4997ce6d0 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,6 +1,6 @@ { "name": "ontime-ui", - "version": "2.8.2", + "version": "2.9.0", "private": true, "dependencies": { "@chakra-ui/react": "^2.7.0", diff --git a/apps/electron/package.json b/apps/electron/package.json index 2ce6bc507..d75cbd5fc 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -1,6 +1,6 @@ { "name": "ontime", - "version": "2.8.2", + "version": "2.9.0", "author": "Carlos Valente", "description": "Time keeping for live events", "repository": "https://github.com/cpvalente/ontime", diff --git a/apps/server/package.json b/apps/server/package.json index d9c0b25c0..c20ad222d 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -2,7 +2,7 @@ "name": "ontime-server", "type": "module", "main": "src/index.ts", - "version": "2.8.2", + "version": "2.9.0", "exports": "./src/index.js", "dependencies": { "body-parser": "^1.20.0", diff --git a/package.json b/package.json index 210136c8c..f0f157cee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ontime", - "version": "2.8.2", + "version": "2.9.0", "description": "Time keeping for live events", "keywords": [ "lighdev",