diff --git a/src/components/CostAndExpenseReport/CostAndExpenseReport.tsx b/src/components/CostAndExpenseReport/CostAndExpenseReport.tsx index 4c2182f..e5e7d2b 100644 --- a/src/components/CostAndExpenseReport/CostAndExpenseReport.tsx +++ b/src/components/CostAndExpenseReport/CostAndExpenseReport.tsx @@ -54,7 +54,7 @@ const CostAndExpenseReport: React.FC = ({ team, customer, subsidiary, nee needAll: true }, { - label: t("Remaining Percentage (<= %)"), + label: t("Budget Remaining Percentage (<= %)"), paramName: "budgetPercentage", type: "number", }, diff --git a/src/components/CreateGroup/CreateGroup.tsx b/src/components/CreateGroup/CreateGroup.tsx index c9b6a69..a77294a 100644 --- a/src/components/CreateGroup/CreateGroup.tsx +++ b/src/components/CreateGroup/CreateGroup.tsx @@ -34,14 +34,20 @@ const CreateGroup: React.FC = ({ auth, users }) => { ...data, removeUserIds: [], removeAuthIds: [], - } console.log(postData) await saveGroup(postData) router.replace("/settings/group") } catch (e) { console.log(e); - setServerError(t("An error has occurred. Please try again later.")); + console.log(data) + if (!data.addUserIds || data.addUserIds.length == 0) { + setServerError(t("Please allocate users.")); + } else if (!data.addAuthIds || data.addAuthIds.length == 0) { + setServerError(t("Please allocate auths.")); + } else { + setServerError(t("An error has occurred. Please try again later.")); + } } }, [router] diff --git a/src/components/EditStaff/StaffInfo.tsx b/src/components/EditStaff/StaffInfo.tsx index 06f197d..9fcabe7 100644 --- a/src/components/EditStaff/StaffInfo.tsx +++ b/src/components/EditStaff/StaffInfo.tsx @@ -437,7 +437,7 @@ const StaffInfo: React.FC = ({ combos }) => { - {t("Join Position")} + {t("Join Position")}