Browse Source

update

tags/Baseline_30082024_FRONTEND_UAT
MSI\derek 1 year ago
parent
commit
9f92988506
3 changed files with 10 additions and 4 deletions
  1. +1
    -1
      src/components/CostAndExpenseReport/CostAndExpenseReport.tsx
  2. +8
    -2
      src/components/CreateGroup/CreateGroup.tsx
  3. +1
    -1
      src/components/EditStaff/StaffInfo.tsx

+ 1
- 1
src/components/CostAndExpenseReport/CostAndExpenseReport.tsx View File

@@ -54,7 +54,7 @@ const CostAndExpenseReport: React.FC<Props> = ({ team, customer, subsidiary, nee
needAll: true needAll: true
}, },
{ {
label: t("Remaining Percentage (<= %)"),
label: t("Budget Remaining Percentage (<= %)"),
paramName: "budgetPercentage", paramName: "budgetPercentage",
type: "number", type: "number",
}, },


+ 8
- 2
src/components/CreateGroup/CreateGroup.tsx View File

@@ -34,14 +34,20 @@ const CreateGroup: React.FC<Props> = ({ auth, users }) => {
...data, ...data,
removeUserIds: [], removeUserIds: [],
removeAuthIds: [], removeAuthIds: [],

} }
console.log(postData) console.log(postData)
await saveGroup(postData) await saveGroup(postData)
router.replace("/settings/group") router.replace("/settings/group")
} catch (e) { } catch (e) {
console.log(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] [router]


+ 1
- 1
src/components/EditStaff/StaffInfo.tsx View File

@@ -437,7 +437,7 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
</Grid> </Grid>
<Grid item xs={6}> <Grid item xs={6}>
<FormControl fullWidth> <FormControl fullWidth>
<InputLabel required>{t("Join Position")}</InputLabel>
<InputLabel>{t("Join Position")}</InputLabel>
<Controller <Controller
control={control} control={control}
name="joinPositionId" name="joinPositionId"


Loading…
Cancel
Save