Skip to content
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

Jump to bottom

improve: some small tweaks to advanced search #245

Merged
merged 6 commits into from
Jan 17, 2024
Merged

improve: some small tweaks to advanced search #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
683935f
disable search when no conditions
Himali-Malvawala Jan 13, 2024
bd4b60c
show loader
Himali-Malvawala Jan 13, 2024
6eb0fbb
default value selected in all the cases for operator select
Himali-Malvawala Jan 16, 2024
113bd4b
default value selected in all the cases for value select
Himali-Malvawala Jan 16, 2024
880219d
switch to old code
Himali-Malvawala Jan 16, 2024
e29ebb1
default value selected in all the cases for operator/value select
Himali-Malvawala Jan 17, 2024
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
38 changes: 23 additions & 15 deletions src/people/components/EditCondition.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Button, FormControl, InputLabel, MenuItem, Select, SelectChangeEvent, TextField } from "@mui/material";
import React from "react";
import { ApiHelper, SearchCondition, Permissions, GroupInterface } from "@churchapps/apphelper";
import { ApiHelper, SearchCondition, Permissions, GroupInterface, Loading } from "@churchapps/apphelper";

interface Props {
conditionAdded: (condition: any) => void
Expand All @@ -11,13 +11,16 @@ export function EditCondition(props: Props) {
const [condition, setCondition] = React.useState<SearchCondition>({ field: "displayName", operator: "equals", value: "" });
const [loadedOptions, setLoadedOptions] = React.useState<any[]>([]);
const [loadedOptionsField, setLoadedOptionsField] = React.useState("");
const [loadingOptions, setLoadingOptions] = React.useState(false);

const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement> | SelectChangeEvent<string>) => {
let c = { ...condition }
switch (e.target.name) {

case "field":
c.field = e.target.value;
c.operator = "equals";
c.value = "";
break;
case "operator":
c.operator = e.target.value;
Expand Down Expand Up @@ -64,12 +67,12 @@ export function EditCondition(props: Props) {
case "birthMonth":
case "anniversaryMonth":
options = [<MenuItem key="January" value="1">January</MenuItem>, <MenuItem key="February" value="2">February</MenuItem>, <MenuItem key="March" value="3">March</MenuItem>, <MenuItem key="April" value="4">April</MenuItem>, <MenuItem key="May" value="5">May</MenuItem>, <MenuItem key="June" value="6">June</MenuItem>, <MenuItem key="July" value="7">July</MenuItem>, <MenuItem key="August" value="8">August</MenuItem>, <MenuItem key="September" value="9">September</MenuItem>, <MenuItem key="October" value="10">October</MenuItem>, <MenuItem key="November" value="11">November</MenuItem>, <MenuItem key="December" value="12">December</MenuItem>]
setDefaultValue("January");
setDefaultValue("1");
result = getValueSelect(options);
break;
case "birthDate":
case "anniversary":
result = <TextField fullWidth label="Value" type="date" style={{ marginBottom: 5 }} name="value" placeholder="Value" value={condition.value} onChange={handleChange} />
result = <TextField fullWidth label="Value" type="date" InputLabelProps={{ shrink: true }} style={{ marginBottom: 5 }} name="value" placeholder="Value" value={condition.value} onChange={handleChange} />
break;
case "age":
case "yearsMarried":
Expand All @@ -86,10 +89,12 @@ export function EditCondition(props: Props) {
if (condition.field !== loadedOptionsField) {
setLoadedOptionsField(condition.field);
if (condition.field === "groupMember") {
setLoadingOptions(true);
ApiHelper.get("/groups", "MembershipApi").then((groups: GroupInterface[]) => {
const options: any[] = [];
groups.forEach(g => { options.push({ value: g.id, text: g.name }); });
setLoadedOptions(options);
setLoadingOptions(false);
});
}
}
Expand All @@ -103,17 +108,7 @@ export function EditCondition(props: Props) {
</FormControl>)

const getOperatorOptions = () => {
let result = [
<MenuItem key="/equals" value="equals">=</MenuItem>,
<MenuItem key="/contains" value="contains">contains</MenuItem>,
<MenuItem key="/startsWith" value="startsWith">starts with</MenuItem>,
<MenuItem key="/endsWith" value="endsWith">ends with</MenuItem>,
<MenuItem key="/greaterThan" value="greaterThan">&gt;</MenuItem>,
<MenuItem key="/greaterThanEqual" value="greaterThanEqual">&gt;=</MenuItem>,
<MenuItem key="/lessThan" value="lessThan">&lt;</MenuItem>,
<MenuItem key="/lessThanEqual" value="lessThanEqual">&lt;=</MenuItem>,
<MenuItem key="/notEquals" value="notEquals">!=</MenuItem>
]
let result = [];

switch (condition?.field) {
case "gender":
Expand All @@ -133,6 +128,19 @@ export function EditCondition(props: Props) {
<MenuItem key="/notIn" value="notIn">is not member of</MenuItem>
]
break;
default:
result = [
<MenuItem key="/equals" value="equals">=</MenuItem>,
<MenuItem key="/contains" value="contains">contains</MenuItem>,
<MenuItem key="/startsWith" value="startsWith">starts with</MenuItem>,
<MenuItem key="/endsWith" value="endsWith">ends with</MenuItem>,
<MenuItem key="/greaterThan" value="greaterThan">&gt;</MenuItem>,
<MenuItem key="/greaterThanEqual" value="greaterThanEqual">&gt;=</MenuItem>,
<MenuItem key="/lessThan" value="lessThan">&lt;</MenuItem>,
<MenuItem key="/lessThanEqual" value="lessThanEqual">&lt;=</MenuItem>,
<MenuItem key="/notEquals" value="notEquals">!=</MenuItem>
]
break;
}
return result;
}
Expand Down Expand Up @@ -175,7 +183,7 @@ export function EditCondition(props: Props) {
</Select>
</FormControl>

{getValueField()}
{loadingOptions ? <Loading /> : <>{getValueField()}</>}
<Button variant="outlined" fullWidth onClick={() => { props.conditionAdded(condition) }}>Save Condition</Button>
</>
}
Expand Down
2 changes: 1 addition & 1 deletion src/people/components/PeopleSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export function PeopleSearch(props: Props) {
return result;
}

const getAdvancedSearch = () => (<InputBox id="advancedSearch" headerIcon="person" headerText="Advanced Search" headerActionContent={<Button onClick={toggleAdvanced} sx={{ textTransform: "none" }}>Simple</Button>} saveFunction={handleAdvancedSearch} saveText="Search" help="chums/advanced-search">
const getAdvancedSearch = () => (<InputBox id="advancedSearch" headerIcon="person" headerText="Advanced Search" headerActionContent={<Button onClick={toggleAdvanced} sx={{ textTransform: "none" }}>Simple</Button>} saveFunction={handleAdvancedSearch} saveText="Search" isSubmitting={conditions.length < 1} help="chums/advanced-search">
<p>All people where:</p>
{getDisplayConditions()}
{getAddCondition()}
Expand Down
Loading