Skip to content

Commit

Permalink
Revert "[fix]管理者画面で絞り込みをAllから個別名に変える(#1708)"
Browse files Browse the repository at this point in the history 
This reverts commit d39665a.
  • Loading branch information
kageya34 committed Nov 21, 2024
1 parent d39665a commit a439ac2
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion admin_view/nuxt-project/pages/announcement/index.vue
View file
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 Years";
this.refYears = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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
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 Yeras";
this.refYears = "ALL";
} 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 Cooking states";
this.refIsCooking = "ALL";
} 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 Categorys";
this.refCategory = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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 Categories";
this.refGroupCategories = "ALL";
} 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 Applicants";
this.refCommittee = "ALL";
} 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 Nationalities";
this.refInternational = "ALL";
} 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 Groups";
this.refExternal = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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 Categories";
this.refGroupCategories = "ALL";
} 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 Nationalities";
this.refInternational = "ALL";
} 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 Gloups";
this.refExternal = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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 Places";
this.refPlaces = "ALL";
} 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 Categories";
this.refGroupCategories = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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 Categories";
this.refGroupCategories = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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 Food";
this.refIsFresh = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} 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 Iteams";
this.refRentalItems = "ALL";
} 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 Categories";
this.refGroupCategories = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand Down
8 changes: 4 additions & 4 deletions admin_view/nuxt-project/pages/stage_orders/index.vue
View file
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 Years";
this.refYears = "ALL";
} 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 Weather";
this.refIsSunny = "ALL";
} else {
this.refIsSunny = name_list[item_id - 1].text;
}
Expand All @@ -439,7 +439,7 @@ export default {
this.refDaysNumID = item_id;
// ALLの時
if (item_id == 0) {
this.refDaysNum = "ALL Days";
this.refDaysNum = "ALL";
} else {
this.refDaysNum = name_list[item_id - 1].days_num;
}
Expand All @@ -448,7 +448,7 @@ export default {
this.refStageID = item_id;
// ALLの時
if (item_id == 0) {
this.refStage = "ALL Stages";
this.refStage = "ALL";
} 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
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 Years";
this.refYears = "ALL";
} else {
this.refYears = name_list[item_id - 1].year_num;
}
Expand Down

0 comments on commit a439ac2

Please sign in to comment.