From e80aceb8ff5b5c7f07f13b41dfff35b2b0fd490a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Mon, 5 Dec 2022 18:57:34 +0800 Subject: [PATCH] Revised the regular expression in the JavaScript summary helper. --- src/accounting/static/accounting/js/summary-helper.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/accounting/static/accounting/js/summary-helper.js b/src/accounting/static/accounting/js/summary-helper.js index f36ac63..c12c912 100644 --- a/src/accounting/static/accounting/js/summary-helper.js +++ b/src/accounting/static/accounting/js/summary-helper.js @@ -329,7 +329,7 @@ function parseSummaryForCategoryHelpers(summary) { }); // A bus route - const matchBus = summary.match(/^(.+)—(.+)—(.+)→(.+?)(?:×[0-9]+)?$/); + const matchBus = summary.match(/^([^—]+)—([^—]+)—([^—]+)→([^—]+?)(?:×[0-9]+)?$/); if (matchBus !== null) { $("#summary-bus-category").get(0).value = matchBus[1]; setSummaryBusCategoryButtons(matchBus[1]); @@ -342,7 +342,7 @@ function parseSummaryForCategoryHelpers(summary) { } // A general travel route - const matchTravel = summary.match(/^(.+)—(.+)([→|↔])(.+?)(?:×[0-9]+)?$/); + const matchTravel = summary.match(/^([^—]+)—([^—]+)([→|↔])([^—]+?)(?:×[0-9]+)?$/); if (matchTravel !== null) { $("#summary-travel-category").get(0).value = matchTravel[1]; setSummaryTravelCategoryButtons(matchTravel[1]); @@ -357,7 +357,7 @@ function parseSummaryForCategoryHelpers(summary) { // A general category const generalCategoryTab = $("#summary-tab-category"); - const matchCategory = summary.match(/^(.+)—.+(?:×[0-9]+)?$/); + const matchCategory = summary.match(/^([^—]+)—.+(?:×[0-9]+)?$/); if (matchCategory !== null) { $("#summary-general-category").get(0).value = matchCategory[1]; setSummaryGeneralCategoryButtons(matchCategory[1]);