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

Ethiopian calendar support: use period picker instead of date picker #206

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ethiopian calendar support: use period picker instead of date picker #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48568d6
Ethiopian calendar support: use period picker instead of date picker
mestachs Nov 13, 2023
a391543
Make the contract filter url backward compatible
mestachs Nov 13, 2023
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
2 changes: 1 addition & 1 deletion src/components/contracts/Contract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Contract {
const startMonthPeriods = DatePeriods.split(period, "monthly");

return startMonthPeriods.some(
(startMonthPeriod) => this.startPeriod <= startMonthPeriod && startMonthPeriod <= this.endPeriod,
(startMonthPeriod) => this.startPeriod <= startMonthPeriod && (this.endPeriod == undefined || startMonthPeriod <= this.endPeriod),
);
}
overlaps(contract) {
Expand Down
66 changes: 49 additions & 17 deletions src/components/contracts/PeriodPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FormControl, TextField, makeStyles } from "@material-ui/core";
import { Divider, FormControl, MenuItem, TextField, makeStyles } from "@material-ui/core";
import { Autocomplete, createFilterOptions } from "@material-ui/lab";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
Expand All @@ -23,14 +23,15 @@ const minYear = 1970;
const maxYear = new Date().getFullYear() + 40;

const PeriodPicker = ({ currentPeriod, mode, fieldName, min, max, onPeriodChange }) => {
const indexOfMonth = mode === "beginning" ? 0 : 2;
const indexOfMonths = mode === "active" ? [0, 1, 2] : mode === "beginning" ? [0] : [2];
const classes = useStyles();
const { t } = useTranslation();
const defaultPeriod = currentPeriod || "" + new Date().getFullYear() + (mode == "beginning" ? "01" : "12");
const defaultPeriod =
mode === "active"
? currentPeriod || ""
: currentPeriod || "" + new Date().getFullYear() + (mode == "beginning" ? "01" : "12");

const [period, setPeriod] = useState(undefined);

const visibibleQuarters = [];
let visibibleQuarters = [];
let year = minYear;
while (year <= maxYear) {
DatePeriods.split("" + year, "quarterly").forEach((p) => visibibleQuarters.push(p));
Expand All @@ -41,15 +42,32 @@ const PeriodPicker = ({ currentPeriod, mode, fieldName, min, max, onPeriodChange
visibibleQuarters.reverse();
}

if (mode === "active") {
const currentQuarters = DatePeriods.split(
DatePeriods.split(DatePeriods.currentQuarter(), "yearly")[0],
"quarterly",
);
visibibleQuarters = currentQuarters.concat(visibibleQuarters);
}

if (!["beginning", "end", "active"].includes(mode)) {
throw new Error("non support mode for period picker '" + mode + "'");
}
let index = 0;

const visibleMonths = visibibleQuarters
.map((period) => {
const monthPeriod = DatePeriods.split(period, "monthly")[indexOfMonth];
return {
value: monthPeriod,
label: DatePeriods.displayName(monthPeriod, "monthYear"),
monthPeriod: monthPeriod,
quarterPeriod: period,
}; // +" / "+
.flatMap((period) => {
return indexOfMonths.map((indexOfMonth) => {
const monthPeriod = DatePeriods.split(period, "monthly")[indexOfMonth];
index = index + 1;
return {
value: monthPeriod,
label: DatePeriods.displayName(monthPeriod, "monthYear"),
monthPeriod: monthPeriod,
quarterPeriod: period,
index: index,
};
});
})
.filter((p) => {
if (min && p.monthPeriod < min) {
Expand All @@ -60,6 +78,9 @@ const PeriodPicker = ({ currentPeriod, mode, fieldName, min, max, onPeriodChange
}
return true;
});

const [period, setPeriod] = useState(undefined);

const handleChange = (newperiod) => {
setPeriod(newperiod);
onPeriodChange(newperiod ? newperiod.monthPeriod : undefined);
Expand All @@ -72,19 +93,29 @@ const PeriodPicker = ({ currentPeriod, mode, fieldName, min, max, onPeriodChange
},
});
const current = visibleMonths.filter((v) => v.monthPeriod === defaultPeriod);

return (
<FormControl>
<Autocomplete
key={"periodpicker-" + currentPeriod}
fullWidth
noOptionsText={t("noResult")}
multiple={false}
value={period}
value={current[0]}
defaultValue={current[0]}
options={visibleMonths}
getOptionLabel={(option) => option.label}
getOptionSelected={(option) => option.value}
filterOptions={filterOptions}
renderOption={(option, props2) => {
const { key, ...otherProps } = props2;
return (
<span>
<li key={option.index} {...otherProps} title={option.monthPeriod}>
{option.label}
</li>
{option.index == 12 && <hr />}
</span>
);
}}
onChange={(event, newValue) => handleChange(newValue)}
renderInput={(params) => (
<TextField
Expand All @@ -97,6 +128,7 @@ const PeriodPicker = ({ currentPeriod, mode, fieldName, min, max, onPeriodChange
InputLabelProps={{
className: classes.label,
}}
title={current[0]?.monthPeriod }
placeholder=""
/>
)}
Expand Down
27 changes: 16 additions & 11 deletions src/components/contracts/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,16 @@ import PluginRegistry from "../core/PluginRegistry";
export const endAtFilter = {
id: "contract_end_date_eq",
key: "contracts.endsAt",
type: "date",
type: "monthlyPeriod",
column: 3,
value: null,
/* value is a string like "12/31/2020"*/
/* value is a string like "202001"*/
onFilter: (value, contracts) => {
if (!value) {
return contracts;
}
const filterPeriodCompents = value.split("/");
const filterPeriod = filterPeriodCompents[2] + filterPeriodCompents[0];

const filteredContracts = contracts.filter((c) => {
return c.endPeriod == filterPeriod;
return c.endPeriod == value;
});
return filteredContracts;
},
Expand All @@ -46,16 +43,22 @@ export const endAtFilter = {
export const activeAtFilter = {
id: "active_at",
key: "contracts.activeAt",
type: "date",
type: "monthlyPeriod",
column: 2,
value: null,
onFilter: (value, contracts) => {
if (!value) {
return contracts;
}
let cleanedValue = value
// previously was a date picker with a date formatter dd/mm/YYYY
/// so we need to turn it into a YYYYmm period
if (value.includes("/")) {
cleanedValue = value.split("/").slice(1).reverse().join("")
debugger
}
const filteredContracts = contracts.filter((c) => {
const contractDates = getContractDates(c);
return moment(value).isBetween(contractDates.startDate, contractDates.endDate);
return c.matchPeriod(cleanedValue)
});
return filteredContracts;
},
Expand Down Expand Up @@ -160,13 +163,15 @@ const defaultFilters = (currentUser) => {
id: "only_sub_contracts",
key: "contracts.onlySubContracts",
type: "checkbox",
column: 2,
column: 1,
value: false,
onFilter: (onlySubContracts, contracts, contractsOverlaps) => {
if (!onlySubContracts) {
return contracts;
}
return contracts.filter((c) => c.fieldValues.contract_main_orgunit && c.fieldValues.contract_main_orgunit !== "");
return contracts.filter(
(c) => c.fieldValues.contract_main_orgunit && c.fieldValues.contract_main_orgunit !== "",
);
},
urlEncode: (value) => (value ? "true" : "false"),
urlDecode: (value) => value === "true",
Expand Down
55 changes: 31 additions & 24 deletions src/components/shared/Filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import InfoIcon from "@material-ui/icons/Info";
import Clear from "@material-ui/icons/Clear";
import { KeyboardDatePicker } from "@material-ui/pickers";
import OuSearch from "./OuSearch";
import PeriodPicker from "../contracts/PeriodPicker";

const styles = (theme) => ({
formControl: {
Expand Down Expand Up @@ -61,10 +62,7 @@ const Filter = ({ filter, setFilterValue, onSearch, t }) => {
case "search": {
return (
<FormControl className={classes.formControl}>
<InputLabel
shrink={filter.value !== ""}
className={classes.searchLabel}
>
<InputLabel shrink={filter.value !== ""} className={classes.searchLabel}>
{t(filter.key)}
</InputLabel>
<Input
Expand Down Expand Up @@ -111,12 +109,7 @@ const Filter = ({ filter, setFilterValue, onSearch, t }) => {
className: classes.input,
}}
value={filter.value === "" ? null : filter.value}
onChange={(newValue) =>
setFilterValue(
filter.id,
newValue ? newValue.format("MM/DD/YYYY") : null,
)
}
onChange={(newValue) => setFilterValue(filter.id, newValue ? newValue.format("MM/DD/YYYY") : null)}
/>

{filter.value && (
Expand All @@ -134,11 +127,9 @@ const Filter = ({ filter, setFilterValue, onSearch, t }) => {
);
}
case "select": {
let shrink =
(filter.value && filter.value !== "") || selectInputValue !== "";
let shrink = (filter.value && filter.value !== "") || selectInputValue !== "";
if (filter.multi) {
shrink =
(filter.value && filter.value.length > 0) || selectInputValue !== "";
shrink = (filter.value && filter.value.length > 0) || selectInputValue !== "";
}
return (
<FormControl className={classes.formControl}>
Expand Down Expand Up @@ -183,9 +174,7 @@ const Filter = ({ filter, setFilterValue, onSearch, t }) => {
<Checkbox
color="primary"
checked={filter.value === true}
onChange={(event) =>
setFilterValue(filter.id, event.target.checked)
}
onChange={(event) => setFilterValue(filter.id, event.target.checked)}
value={filter.value}
/>
}
Expand All @@ -198,17 +187,35 @@ const Filter = ({ filter, setFilterValue, onSearch, t }) => {
<OuSearch
defaultValue={filter.value}
label={t("limit_org_unit_under")}
onChange={
(orgunit) => {
setFilterValue(filter.id, orgunit ? orgunit.id : undefined)
}
}
onChange={(orgunit) => {
setFilterValue(filter.id, orgunit ? orgunit.id : undefined);
}}
/>
)
);
}

case "monthlyPeriod": {
let cleanedValue = filter.value;
// previously was a date picker with a date formatter dd/mm/YYYY
/// so we need to turn it into a YYYYmm period
if (cleanedValue && cleanedValue.includes("/")) {
cleanedValue = filter.value.split("/").slice(1).reverse().join("");
}
return (
<div style={{ marginTop: "5px" }}>
<PeriodPicker
fieldName={t(filter.key)}
currentPeriod={cleanedValue}
mode="active"
onPeriodChange={(p) => setFilterValue(filter.id, p)}
></PeriodPicker>
<br></br>
</div>
);
}

default:
return "unsupported "+filter.type;
return "unsupported " + filter.type;
}
};
Filter.defaultProps = {
Expand Down
Loading