Fixed issue where a postal code starting with 0 issue #113

README.md

@@ -12,7 +12,8 @@
 NodeJS v14 or higher is required.
 
 ## Migration Guides
-[Migration guide to 3.3.x](docs/guide/migration_3.3.x.md)\
+[Migration guide to 3.3.4](docs/guide/migration_3.3.4.md)\
+[Migration guide to 3.3.3](docs/guide/migration_3.3.x.md)\
 [Migration guide to 3.1.x](docs/guide/migration_3.1.x.md)
 
 ## Documentation
@@ -26,6 +27,9 @@ NodeJS v14 or higher is required.
  Placeholder for the next version (at the beginning of the line):
  ### __WORK IN PROGRESS__ (- falls nicht benötigt löschen sonst klammern entfernen und nach dem - dein text schreiben)
  -->
+### __WORK IN PROGRESS__
+* (xXBJXx) Fixed an issue where a postal code starting with 0 was not displayed correctly [Issue #113](https://github.com/iobroker-community-adapters/ioBroker.tankerkoenig/issues/113)
+
 ### 3.3.3 (2023-01-02)
 * (xXBJXx) fixed => adapter does not fetch data after a `requestData error` e.g. internet termination.
 * (xXBJXx) add adapter migration Guide from 3.1.x to 3.3.x or 3.2.x to 3.3.x [Migration guide](docs/guide/migration_3.3.x.md)

admin/src/Modal/AddModal.tsx

@@ -33,7 +33,7 @@ export const AddModal: React.FC<AddModalProps> = ({
 		city: '',
 		discountObj: { discount: 0, discountType: '', fuelType: [] },
 		discounted: false,
-		postCode: 0,
+		postCode: '',
 		station: '',
 		stationname: '',
 		street: '',

admin/src/SettingPage.tsx

@@ -90,7 +90,6 @@ export const SettingPage: React.FC<SettingPageProps> = ({ onChange, settings, se
 			});
 		}
 	};
-
 	//add row
 	const handleAdd = async (value: ioBroker.Station): Promise<void> => {
 		newRow = [...settings.station];

admin/src/component/AddStationDialog.tsx

@@ -71,7 +71,7 @@ export const AddStationDialog: React.FC<RowProps> = ({ addRow }): JSX.Element =>
 		stationname: '',
 		street: '',
 		city: '',
-		postCode: 0,
+		postCode: '',
 		houseNumber: '',
 		discounted: false,
 		discountObj: {
@@ -83,7 +83,7 @@ export const AddStationDialog: React.FC<RowProps> = ({ addRow }): JSX.Element =>
 	const [copyValid, setCopyValid] = useState(false);
 	const [street, setStreet] = useState<string>('');
 	const [city, setCity] = useState<string>('');
-	const [postCode, setPostCode] = useState<number>(0);
+	const [postCode, setPostCode] = useState<string>('');
 	const [houseNumber, setHouseNumber] = useState<string>('');
 
 	useEffect(() => {
@@ -128,7 +128,24 @@ export const AddStationDialog: React.FC<RowProps> = ({ addRow }): JSX.Element =>
 				});
 				setCity(result.city);
 				setHouseNumber(result.houseNumber);
-				setPostCode(result.postCode);
+
+				if (result.postCode) {
+					result.postCode = result.postCode.toString();
+					if (result.postCode !== '') {
+						// check if the zip code has 5 digits
+						if (result.postCode.length === 5) {
+							setPostCode(result.postCode);
+						} else {
+							// setze der postleitzahl eine 0 voran
+							setPostCode('0' + result.postCode);
+						}
+					} else {
+						setPostCode('');
+					}
+				} else {
+					setPostCode('');
+				}
+
 				setStreet(result.street);
 			}
 		} else {
@@ -161,11 +178,14 @@ export const AddStationDialog: React.FC<RowProps> = ({ addRow }): JSX.Element =>
 	const handleChangePostCode = (event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>): void => {
 		const newPostCode: string = event.target.value;
 		if (newPostCode !== '') {
-			setPostCode(parseInt(newPostCode));
-			setNewRow({ ...newRow, postCode: parseInt(newPostCode) });
+			// check if the input consists of numbers only
+			if (newPostCode.match(/^[0-9]+$/)) {
+				setPostCode(newPostCode);
+				setNewRow({ ...newRow, postCode: newPostCode });
+			}
 		} else {
-			setPostCode(0);
-			setNewRow({ ...newRow, postCode: 0 });
+			setPostCode('');
+			setNewRow({ ...newRow, postCode: '' });
 		}
 	};
 
@@ -468,7 +488,7 @@ export const AddStationDialog: React.FC<RowProps> = ({ addRow }): JSX.Element =>
 					>
 						<React.Fragment>
 							<Tooltip
-								title={_('tooltipStationName')}
+								title={_('tooltipStationStreet')}
 								arrow
 								placement={'top'}
 								enterNextDelay={500}
@@ -518,7 +538,7 @@ export const AddStationDialog: React.FC<RowProps> = ({ addRow }): JSX.Element =>
 								/>
 							</Tooltip>
 							<Tooltip
-								title={_('tooltipStationName')}
+								title={_('tooltipStationCity')}
 								arrow
 								placement={'top'}
 								enterNextDelay={500}
@@ -543,7 +563,7 @@ export const AddStationDialog: React.FC<RowProps> = ({ addRow }): JSX.Element =>
 								/>
 							</Tooltip>
 							<Tooltip
-								title={_('tooltipStationName')}
+								title={_('tooltipStationZip')}
 								arrow
 								placement={'top'}
 								enterNextDelay={500}
@@ -552,15 +572,14 @@ export const AddStationDialog: React.FC<RowProps> = ({ addRow }): JSX.Element =>
 								<TextField
 									label={_('stationZip')}
 									value={postCode.toString()}
-									type={'number'}
+									type={'text'}
 									margin={'normal'}
 									sx={{
 										width: '15ch',
 									}}
 									placeholder={'10910'}
 									inputProps={{
-										maxLength: 6,
-										min: 0,
+										maxLength: 5,
 										style: { textAlign: 'center' },
 									}}
 									onChange={(event) => {

admin/src/component/EditTableDialog.tsx

@@ -58,7 +58,7 @@ export const EditTableDialog: React.FC<RowProps> = ({ editRow, oldRow, checkAler
 			stationname: '',
 			street: '',
 			city: '',
-			postCode: 0,
+			postCode: '',
 			houseNumber: '',
 			discounted: false,
 			discountObj: {
@@ -80,7 +80,7 @@ export const EditTableDialog: React.FC<RowProps> = ({ editRow, oldRow, checkAler
 	const [name, setName] = useState<string>(oldRow.stationname);
 	const [street, setStreet] = useState<string>(oldRow.street || '');
 	const [city, setCity] = useState<string>(oldRow.city || '');
-	const [postCode, setPostCode] = useState<number>(oldRow.postCode || 0);
+	const [postCode, setPostCode] = useState<string>(oldRow.postCode || '');
 	const [houseNumber, setHouseNumber] = useState<string>(oldRow.houseNumber || '');
 	const [discountType, setDiscountType] = useState<string>(oldRow.discountObj.discountType);
 	const [discount, setDiscount] = useState<number>(oldRow.discountObj.discount);
@@ -146,9 +146,26 @@ export const EditTableDialog: React.FC<RowProps> = ({ editRow, oldRow, checkAler
 				});
 				setCity(result.city);
 				setHouseNumber(result.houseNumber);
-				setPostCode(result.postCode);
+
+				if (result.postCode) {
+					result.postCode = result.postCode.toString();
+					if (result.postCode !== '') {
+						// check if the zip code has 5 digits
+						if (result.postCode.length === 5) {
+							setPostCode(result.postCode);
+						} else {
+							// setze der postleitzahl eine 0 voran
+							setPostCode('0' + result.postCode);
+						}
+					} else {
+						setPostCode('');
+					}
+				} else {
+					setPostCode('');
+				}
 				setStreet(result.street);
 			}
+
 			setValid(false);
 		} else {
 			setValid(true);
@@ -204,11 +221,14 @@ export const EditTableDialog: React.FC<RowProps> = ({ editRow, oldRow, checkAler
 	const handleChangePostCode = (event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>): void => {
 		const newPostCode: string = event.target.value;
 		if (newPostCode !== '') {
-			setPostCode(parseInt(newPostCode));
-			setEditRow({ ...newEditRow, postCode: parseInt(newPostCode) });
+			// check if the input consists of numbers only
+			if (newPostCode.match(/^[0-9]+$/)) {
+				setPostCode(newPostCode);
+				setEditRow({ ...newEditRow, postCode: newPostCode });
+			}
 		} else {
-			setPostCode(0);
-			setEditRow({ ...newEditRow, postCode: 0 });
+			setPostCode('');
+			setEditRow({ ...newEditRow, postCode: '' });
 		}
 	};
 	const handleChangeHouseNumber = (
@@ -593,7 +613,7 @@ export const EditTableDialog: React.FC<RowProps> = ({ editRow, oldRow, checkAler
 									}}
 									placeholder={'10910'}
 									inputProps={{
-										maxLength: 6,
+										maxLength: 5,
 										style: { textAlign: 'center' },
 									}}
 									onChange={(event) => {

admin/src/index.tsx

@@ -52,7 +52,7 @@ const migrateSettings = (settings: ioBroker.AdapterConfig) => {
 	if (settings.station === undefined) {
 		settings.station = [];
 	}
-	if (settings.station !== undefined) {
+	if (settings.station.length !== 0) {
 		settings.station.map((stationValue, index) => {
 			if (stationValue.station === undefined) {
 				settings.station[index].station = '';
@@ -76,11 +76,9 @@ const migrateSettings = (settings: ioBroker.AdapterConfig) => {
 			if (stationValue.street === undefined) {
 				settings.station[index].street = '';
 			}
-			if (typeof stationValue.postCode === 'string') {
-				settings.station[index].postCode = parseInt(stationValue.postCode);
-			}
+
 			if (stationValue.postCode === undefined) {
-				settings.station[index].postCode = 0;
+				settings.station[index].postCode = '';
 			}
 			if (stationValue.city === undefined) {
 				settings.station[index].city = '';

admin/src/lib/DetailRequest.ts

@@ -7,7 +7,7 @@ export interface RequestDetailProps {
 		street: string;
 		city: string;
 		houseNumber: string;
-		postCode: number;
+		postCode: string;
 		latitude: number;
 		longitude: number;
 		wholeDay: boolean;