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

MVJ-421 Fix review days in edit mode #553

Merged
merged 2 commits into from
Dec 11, 2024
Merged

MVJ-421 Fix review days in edit mode #553

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
86824a4
rent tab: tasotarkistus review days according to index type
NC-jsAhonen Dec 10, 2024
8848442
enum name fixes
NC-jsAhonen Dec 10, 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
50 changes: 16 additions & 34 deletions src/leases/components/leaseSections/rent/OldDwellingsInHousingCompaniesPriceIndexEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { connect } from "react-redux";
import type {
OldDwellingsInHousingCompaniesPriceIndex as OldDwellingsInHousingCompaniesPriceIndexProps,
IndexPointFigureYearly as IndexPointFigureYearlyProps,
OldDwellingsInHousingCompaniesPriceIndexType,
} from "@/leases/types";
import BoxItemContainer from "@/components/content/BoxItemContainer";
import { withWindowResize } from "@/components/resize/WindowResizeHandler";
Expand All @@ -24,9 +25,11 @@ import { getUiDataLeaseKey } from "@/uiData/helpers";
import { formatDate, getFieldAttributes } from "@/util/helpers";
import FormField from "@/components/form/FormField";
import { Attributes } from "@/types";
import { getReviewDays } from "@/leases/helpers";

type Props = {
oldDwellingsInHousingCompaniesPriceIndex: OldDwellingsInHousingCompaniesPriceIndexProps;
oldDwellingsInHousingCompaniesPriceIndexType: OldDwellingsInHousingCompaniesPriceIndexType;
leaseAttributes: Attributes;
leaseStartDate: string;
isSaveClicked: boolean;
Expand All @@ -45,37 +48,24 @@ const getLastYearsIndexPointNumber = (
: "Indeksipisteluvut puuttuvat";
};

const getReviewDaysSorted = (
pointFigures: IndexPointFigureYearlyProps[],
): IndexPointFigureYearlyProps[] => {
// deep copy
const sortedNumbers = JSON.parse(JSON.stringify(pointFigures));

sortedNumbers.sort(
(a: IndexPointFigureYearlyProps, b: IndexPointFigureYearlyProps) =>
a.year - b.year,
);
return sortedNumbers;
};

class OldDwellingsInHousingCompaniesPriceIndexViewEdit extends PureComponent<Props> {
class OldDwellingsInHousingCompaniesPriceIndexEdit extends PureComponent<Props> {
render() {
const {
oldDwellingsInHousingCompaniesPriceIndex,
oldDwellingsInHousingCompaniesPriceIndexType,
leaseAttributes,
leaseStartDate,
isSaveClicked,
} = this.props;

if (!oldDwellingsInHousingCompaniesPriceIndex) {
return <p>Lisää tasotarkistus</p>;
return null;
}

const {
point_figures: pointFigures,
source_table_label: sourceTableLabel,
} = oldDwellingsInHousingCompaniesPriceIndex || {};
console.log("leaseAttributes", leaseAttributes);
return (
<Fragment>
<BoxItemContainer>
Expand All @@ -90,7 +80,6 @@ class OldDwellingsInHousingCompaniesPriceIndexViewEdit extends PureComponent<Pro
name="old_dwellings_in_housing_companies_price_index_type"
overrideValues={{
label: LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldTitles.TYPE,
type: "choice",
}}
// enableUiDataEdit
// uiDataKey={getUiDataLeaseKey(LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.OLD_DWELLINGS_IN_HOUSING_COMPANIES_PRICE_INDEX_TYPE)}
Expand Down Expand Up @@ -124,22 +113,15 @@ class OldDwellingsInHousingCompaniesPriceIndexViewEdit extends PureComponent<Pro
}
</FormTextTitle>
<>
{pointFigures && !!pointFigures.length
? getReviewDaysSorted(pointFigures).map(
(number: IndexPointFigureYearlyProps, index: number) => {
return (
<FormText
key={
LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NUMBERS +
`[${index}]`
}
>
{`1.1.${number.year}`}
</FormText>
);
},
)
: ""}
{leaseStartDate ?
getReviewDays(leaseStartDate, oldDwellingsInHousingCompaniesPriceIndexType).map(
(date: string, index: number) => {
return <FormText key={LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NUMBERS + `[${index}]`}>
{date}
</FormText>
}
)
: ""}
</>
</Column>
</Row>
Expand All @@ -157,4 +139,4 @@ export default flowRight(
leaseStartDate: getCurrentLeaseStartDate(state),
};
}),
)(OldDwellingsInHousingCompaniesPriceIndexViewEdit);
)(OldDwellingsInHousingCompaniesPriceIndexEdit);
6 changes: 5 additions & 1 deletion src/leases/components/leaseSections/rent/RentItemEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ class RentItemEdit extends PureComponent<Props, State> {
rentTypeIsManual = rentType === RentTypes.MANUAL,
rentTypeIsFixed = rentType === RentTypes.FIXED;
const oldDwellingsInHousingCompaniesPriceIndex = get(savedRent, 'old_dwellings_in_housing_companies_price_index');
const oldDwellingsInHousingCompaniesPriceIndexType = get(savedRent, 'old_dwellings_in_housing_companies_price_index_type');
return <Collapse archived={archived} defaultOpen={rentCollapseState !== undefined ? rentCollapseState : active || rents.length === 1 && !archived} hasErrors={isSaveClicked && !isEmpty(rentErrors)} headerTitle={<Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.TYPE)}>
{getLabelOfOption(typeOptions, get(savedRent, 'type')) || '-'}
</Authorization>} headerSubtitles={<Column small={6} medium={8} large={10}>
Expand All @@ -278,7 +279,10 @@ class RentItemEdit extends PureComponent<Props, State> {

<Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.OLD_DWELLINGS_IN_HOUSING_COMPANIES_PRICE_INDEX)}>
<Collapse className='collapse__secondary' defaultOpen={oldDwellingsInHousingCompaniesPriceIndexCollapseState !== undefined ? oldDwellingsInHousingCompaniesPriceIndexCollapseState : true} hasErrors={/*TODO: Error handling*/false} headerTitle={`${LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldTitles.OLD_DWELLINGS_IN_HOUSING_COMPANIES_PRICE_INDEX}`} onToggle={this.handleFixedInitialYearRentsCollapseToggle}>
<OldDwellingsInHousingCompaniesPriceIndexEdit oldDwellingsInHousingCompaniesPriceIndex={oldDwellingsInHousingCompaniesPriceIndex} />
<OldDwellingsInHousingCompaniesPriceIndexEdit
oldDwellingsInHousingCompaniesPriceIndex={oldDwellingsInHousingCompaniesPriceIndex}
oldDwellingsInHousingCompaniesPriceIndexType={oldDwellingsInHousingCompaniesPriceIndexType}
/>
</Collapse>
</Authorization>

Expand Down
8 changes: 4 additions & 4 deletions src/leases/enums.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1615,11 +1615,11 @@ export const calculatorTypeOptions = [{
}];

export const oldDwellingsInHousingCompaniesPriceIndexTypes = {
["TASOTARKISTUS_20_20"]: "Tasotarkistus 20v/20v",
["TASOTARKISTUS_20_10"]: "Tasotarkistus 20v/10v",
TASOTARKISTUS_20_20: "Tasotarkistus 20v/20v",
TASOTARKISTUS_20_10: "Tasotarkistus 20v/10v",
}

export const oldDwellingsInHousingCompaniesPriceIndexTypeOptions = {
TYPE_20_20: "TASOTARKISTUS_20_20",
TYPE_20_10: "TASOTARKISTUS_20_10",
TASOTARKISTUS_20_20: "TASOTARKISTUS_20_20",
TASOTARKISTUS_20_10: "TASOTARKISTUS_20_10",
};
17 changes: 9 additions & 8 deletions src/leases/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2943,23 +2943,24 @@ export const sortRelatedHistoryItems = (a: Record<string, any>, b: Record<string
*/
export const getReviewDays = (startDate: string, priceIndexType: OldDwellingsInHousingCompaniesPriceIndexType): Array<string> => {
const checkDays = [];
let increment: number;
let increments: Array<number>;

if (priceIndexType === oldDwellingsInHousingCompaniesPriceIndexTypeOptions.TYPE_20_10) {
increment = 10;
} else if (priceIndexType === oldDwellingsInHousingCompaniesPriceIndexTypeOptions.TYPE_20_20) {
increment = 20;
if (priceIndexType === oldDwellingsInHousingCompaniesPriceIndexTypeOptions.TASOTARKISTUS_20_10) {
increments = [20, 10, 10];
} else if (priceIndexType === oldDwellingsInHousingCompaniesPriceIndexTypeOptions.TASOTARKISTUS_20_20) {
increments = [20, 20, 20];
} else {
return [];
}

for (let i = 1; i <= 3; i++) {
increments.forEach((_, i) => {
const date = new Date(startDate);
date.setDate(1);
date.setMonth(6);
date.setFullYear(date.getFullYear() + i * increment);
const totalCurrentIncrements = increments.slice(0, i + 1).reduce((a, b) => a + b, 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

consider using different argument variable names for reduce than a, b. In order they are accumulator, currentValue

date.setFullYear(date.getFullYear() + totalCurrentIncrements);
checkDays.push(date.toLocaleDateString('fi-FI'));
}
})

return checkDays;
}
Loading