Skip to content

[fix]管理者画面で絞り込みをAllから個別名に変える(#1708) #1712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kageya34 wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

[fix]管理者画面で絞り込みをAllから個別名に変える(#1708) #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c87f7e3
[fix]管理者画面で絞り込みをAllから個別名に変える(#1708)
Nov 21, 2024
34ea9db
管理者画面で絞り込みをAllから個別名に変える2
Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin_view/nuxt-project/pages/announcement/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand Down
2 changes: 1 addition & 1 deletion admin_view/nuxt-project/pages/cooking_process_order/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand Down
2 changes: 1 addition & 1 deletion admin_view/nuxt-project/pages/employees/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand Down
6 changes: 3 additions & 3 deletions admin_view/nuxt-project/pages/food_products/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Yeras";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand All @@ -290,7 +290,7 @@ export default {
this.refIsCookingID = item_id;
// ALLの時
if (item_id === 0) {
this.refIsCooking = "ALL";
this.refIsCooking = "ALL Cooking States";
} else {
this.refIsCooking = name_list[item_id - 1].text;
}
Expand All @@ -300,7 +300,7 @@ export default {
this.refCategoryID = item_id;
// ALLの時
if (item_id === 0) {
this.refCategory = "ALL";
this.refCategory = "ALL Categorys";
} else {
this.refCategory = name_list[item_id - 1].text;
}
Expand Down
10 changes: 5 additions & 5 deletions admin_view/nuxt-project/pages/groups/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand All @@ -355,7 +355,7 @@ export default {
this.refCategoryID = item_id;
// ALLの時
if (item_id == 0) {
this.refGroupCategories = "ALL";
this.refGroupCategories = "ALL Categories";
} else {
this.refGroupCategories = name_list[item_id - 1].name;
}
Expand All @@ -364,7 +364,7 @@ export default {
this.refCommitteeID = item_id;
// ALLの時
if (item_id == 0) {
this.refCommittee = "ALL";
this.refCommittee = "ALL Applicants";
} else {
this.refCommittee = name_list[item_id - 1].value;
}
Expand All @@ -373,7 +373,7 @@ export default {
this.refInternationalID = item_id;
// ALLの時
if (item_id == 0) {
this.refInternational = "ALL";
this.refInternational = "ALL Nationalities";
} else {
this.refInternational = name_list[item_id - 1].value;
}
Expand All @@ -382,7 +382,7 @@ export default {
this.refExternalID = item_id;
// ALLの時
if (item_id == 0) {
this.refExternal = "ALL";
this.refExternal = "ALL Groups";
} else {
this.refExternal = name_list[item_id - 1].value;
}
Expand Down
8 changes: 4 additions & 4 deletions admin_view/nuxt-project/pages/order_status_check/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,15 +281,15 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
} else if (name_list.toString() == this.groupCategories.toString()) {
this.refCategoryID = item_id;
// ALLの時
if (item_id == 0) {
this.refGroupCategories = "ALL";
this.refGroupCategories = "ALL Categories";
} else {
this.refGroupCategories = name_list[item_id - 1].name;
}
Expand All @@ -298,7 +298,7 @@ export default {
this.refInternationalID = item_id;
// ALLの時
if (item_id == 0) {
this.refInternational = "ALL";
this.refInternational = "ALL Nationalities";
} else {
this.refInternational = name_list[item_id - 1].value;
}
Expand All @@ -307,7 +307,7 @@ export default {
this.refExternalID = item_id;
// ALLの時
if (item_id == 0) {
this.refExternal = "ALL";
this.refExternal = "ALL Gloups";
} else {
this.refExternal = name_list[item_id - 1].value;
}
Expand Down
6 changes: 3 additions & 3 deletions admin_view/nuxt-project/pages/place_orders/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,15 +267,15 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
} else if (name_list.toString() == this.placeList.toString()) {
this.refPlaceID = item_id;
// ALLの時
if (item_id == 0) {
this.refPlaces = "ALL";
this.refPlaces = "ALL Places";
} else {
this.refPlaces = name_list[item_id - 1].name;
}
Expand All @@ -284,7 +284,7 @@ export default {
this.refCategoryID = item_id;
// ALLの時
if (item_id == 0) {
this.refGroupCategories = "ALL";
this.refGroupCategories = "ALL Categories";
} else {
this.refGroupCategories = name_list[item_id - 1].name;
}
Expand Down
4 changes: 2 additions & 2 deletions admin_view/nuxt-project/pages/power_orders/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand All @@ -269,7 +269,7 @@ export default {
this.refCategoryID = item_id;
// ALLの時
if (item_id == 0) {
this.refGroupCategories = "ALL";
this.refGroupCategories = "ALL Categories";
} else {
this.refGroupCategories = name_list[item_id - 1].name;
}
Expand Down
2 changes: 1 addition & 1 deletion admin_view/nuxt-project/pages/public_relations/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand Down
4 changes: 2 additions & 2 deletions admin_view/nuxt-project/pages/purchase_lists/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand All @@ -283,7 +283,7 @@ export default {
this.refIsFreshID = item_id;
// ALLの時
if (item_id == 0) {
this.refIsFresh = "ALL";
this.refIsFresh = "ALL Food";
} else {
this.refIsFresh = name_list[item_id - 1].value;
}
Expand Down
6 changes: 3 additions & 3 deletions admin_view/nuxt-project/pages/rental_orders/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand All @@ -236,7 +236,7 @@ export default {
this.refRentalItemID = item_id;
// ALLの時
if (item_id == 0) {
this.refRentalItems = "ALL";
this.refRentalItems = "ALL Iteams";
} else {
this.refRentalItems = name_list[item_id - 1].name;
}
Expand All @@ -245,7 +245,7 @@ export default {
this.refCategoryID = item_id;
// ALLの時
if (item_id == 0) {
this.refGroupCategories = "ALL";
this.refGroupCategories = "ALL Categories";
} else {
this.refGroupCategories = name_list[item_id - 1].name;
}
Expand Down
2 changes: 1 addition & 1 deletion admin_view/nuxt-project/pages/representatives/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand Down
10 changes: 5 additions & 5 deletions admin_view/nuxt-project/pages/stage_common_options/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand All @@ -337,7 +337,7 @@ export default {
this.refIsOwnEquipmentID = item_id;
// ALLの時
if (item_id == 0) {
this.refIsOwnEquipment = "ALL";
this.refIsOwnEquipment = "All Devices: Owned or Not";
} else {
this.refIsOwnEquipment = name_list[item_id - 1].value;
}
Expand All @@ -346,7 +346,7 @@ export default {
this.refIsBgmID = item_id;
// ALLの時
if (item_id == 0) {
this.refIsBgm = "ALL";
this.refIsBgm = "All Music Options";
} else {
this.refIsBgm = name_list[item_id - 1].value;
}
Expand All @@ -355,7 +355,7 @@ export default {
this.refIsCameraPermissionID = item_id;
// ALLの時
if (item_id == 0) {
this.refIsCameraPermission = "ALL";
this.refIsCameraPermission = "ALL Shooting Permissions";
} else {
this.refIsCameraPermission = name_list[item_id - 1].value;
}
Expand All @@ -364,7 +364,7 @@ export default {
this.refIsLoudSoundID = item_id;
// ALLの時
if (item_id == 0) {
this.refIsLoudSound = "ALL";
this.refIsLoudSound = "ALL Sound Levels";
} else {
this.refIsLoudSound = name_list[item_id - 1].value;
}
Expand Down
10 changes: 5 additions & 5 deletions admin_view/nuxt-project/pages/stage_orders/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand All @@ -430,7 +430,7 @@ export default {
this.refIsSunnyID = item_id;
// ALLの時
if (item_id == 0) {
this.refIsSunny = "ALL";
this.refIsSunny = "ALL Weather: Sunny or Not";
} else {
this.refIsSunny = name_list[item_id - 1].text;
}
Expand All @@ -439,16 +439,16 @@ export default {
this.refDaysNumID = item_id;
// ALLの時
if (item_id == 0) {
this.refDaysNum = "ALL";
this.refDaysNum = "ALL Days";
} else {
this.refDaysNum = name_list[item_id - 1].days_num;
}
// stage_idで絞り込むとき
} else if (name_list.toString() == this.stageList.toString()) {
} else if (JSON.stringify(name_list) === JSON.stringify(this.stageList)) {
this.refStageID = item_id;
// ALLの時
if (item_id == 0) {
this.refStage = "ALL";
this.refStage = "ALL Stages";
} else {
this.refStage = name_list[item_id - 1].name;
}
Expand Down
2 changes: 1 addition & 1 deletion admin_view/nuxt-project/pages/venue_maps/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export default {
this.refYearID = item_id;
// ALLの時
if (item_id == 0) {
this.refYears = "ALL";
this.refYears = "ALL Years";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand Down