Skip to content

Commit

Permalink
fix merge and rebase erorrs
Browse files Browse the repository at this point in the history
  • Loading branch information
justin-phxm committed Feb 3, 2024
1 parent 5937580 commit fe3a54b
Showing 1 changed file with 2 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {
I_PISField,
I_PISFieldData,
} from "../../objects/PIS/PIS.interface";
import I_PIS from "../../objects/PIS/PIS.interface";

type RangeCheckedFieldDataProps = {
fieldData: I_PISFieldData;
Expand Down Expand Up @@ -69,21 +70,6 @@ type FieldDataFormatterProps = {
function FieldDataFormatter(props: FieldDataFormatterProps): JSX.Element {
const { data, fstring } = props;

const formatString = (
string: string,
params: I_PISFieldData[],
): JSX.Element | string => {
// %s •C (%s) - %s •C (%s)

return string.replace(/%s/g, (_, index) => {
return typeof params[new Number(index).valueOf()] === "undefined"
? ""
: RangeCheckedFieldData({
fieldData: data[new Number(index).valueOf()],
});
});
};

return fstring === undefined ? (
<div>
<RangeCheckedFieldData fieldData={data[0]} />
Expand Down Expand Up @@ -133,7 +119,7 @@ function FieldsPrinter(props: FieldsPrinterProps): JSX.Element {
);
}
type PIStransformerProps = {
root: { [key: string]: I_PISField[] };
root: I_PIS;
depth?: number;
};

Expand Down

0 comments on commit fe3a54b

Please sign in to comment.