Minor bug fixes. BOD-223 BOD-226

This commit is contained in:
Patrick Fic
2020-08-04 10:16:04 -07:00
parent 69698a2976
commit 470f69b11c
2 changed files with 11 additions and 9 deletions

View File

@@ -25,23 +25,23 @@ const EmployeeSearchSelect = (
width: 400,
}}
onChange={setOption}
optionFilterProp='search'
optionFilterProp="search"
onSelect={onSelect}
onBlur={onBlur}>
onBlur={onBlur}
>
{options
? options.map((o) => (
<Option
key={o.id}
value={o.id}
search={`${o.employee_number} ${o.first_name} ${o.last_name}`}
discount={o.discount}>
discount={o.discount}
>
<div style={{ display: "flex" }}>
{`${o.employee_number} ${o.first_name} ${o.last_name}`}
<Tag color='blue'>{o.cost_center}</Tag>
<Tag color='red'>
<CurrencyFormatter>{o.base_rate}</CurrencyFormatter>
</Tag>
<Tag color='green'>
<Tag color="blue">{o.cost_center}</Tag>
<Tag color="green">
{o.flat_rate
? t("timetickets.labels.flat_rate")
: t("timetickets.labels.straight_time")}

View File

@@ -68,6 +68,7 @@ export function NoteUpsertModalContainer({
},
}).then((r) => {
if (refetch) refetch();
form.resetFields();
toggleModalVisible();
notification["success"]({
message: t("notes.successes.create"),
@@ -87,7 +88,8 @@ export function NoteUpsertModalContainer({
onCancel={() => {
toggleModalVisible();
}}
destroyOnClose>
destroyOnClose
>
<Form form={form} onFinish={handleFinish} initialValues={existingNote}>
<NoteUpsertModalComponent />
</Form>