imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Revised the regular expression in the JavaScript summary helper.

Browse Source
This commit is contained in:
依瑪貓 2022-12-05 18:57:34 +08:00
parent 649f76d9db
commit e80aceb8ff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/accounting/static/accounting/js/summary-helper.js
View File

@ -329,7 +329,7 @@ function parseSummaryForCategoryHelpers(summary) {
}); });
// A bus route // A bus route
const matchBus = summary.match(/^(.+)—(.+)—(.+)→(.+?)(?:×[0-9]+)?$/); const matchBus = summary.match(/^([^—]+)—([^—]+)—([^—]+)→([^—]+?)(?:×[0-9]+)?$/);
if (matchBus !== null) { if (matchBus !== null) {
$("#summary-bus-category").get(0).value = matchBus[1]; $("#summary-bus-category").get(0).value = matchBus[1];
setSummaryBusCategoryButtons(matchBus[1]); setSummaryBusCategoryButtons(matchBus[1]);
@ -342,7 +342,7 @@ function parseSummaryForCategoryHelpers(summary) {
} }
// A general travel route // A general travel route
const matchTravel = summary.match(/^(.+)—(.+)([→|↔])(.+?)(?:×[0-9]+)?$/); const matchTravel = summary.match(/^([^—]+)—([^—]+)([→|↔])([^—]+?)(?:×[0-9]+)?$/);
if (matchTravel !== null) { if (matchTravel !== null) {
$("#summary-travel-category").get(0).value = matchTravel[1]; $("#summary-travel-category").get(0).value = matchTravel[1];
setSummaryTravelCategoryButtons(matchTravel[1]); setSummaryTravelCategoryButtons(matchTravel[1]);
@ -357,7 +357,7 @@ function parseSummaryForCategoryHelpers(summary) {
// A general category // A general category
const generalCategoryTab = $("#summary-tab-category"); const generalCategoryTab = $("#summary-tab-category");
const matchCategory = summary.match(/^(.+)—.+(?:×[0-9]+)?$/); const matchCategory = summary.match(/^([^—]+)—.+(?:×[0-9]+)?$/);
if (matchCategory !== null) { if (matchCategory !== null) {
$("#summary-general-category").get(0).value = matchCategory[1]; $("#summary-general-category").get(0).value = matchCategory[1];
setSummaryGeneralCategoryButtons(matchCategory[1]); setSummaryGeneralCategoryButtons(matchCategory[1]);