From 92afc55b4e6e6b65498f1c15b0aee40c0a32424f Mon Sep 17 00:00:00 2001
From: mmehta2669 <mmehta5@slu.edu>
Date: Mon, 25 Nov 2024 19:59:21 -0600
Subject: [PATCH 1/4] create unit changes

---
 .../meters/CreateMeterModalComponent.tsx      | 29 ++++++++++++----
 .../unit/CreateUnitModalComponent.tsx         | 33 ++++++++++++++++++-
 src/client/app/types/redux/units.ts           | 26 ++++++++-------
 src/server/migrations/1.0.0-2.0.0/index.js    |  1 +
 .../units/alter_units_table_add_columns.sql   |  8 +++++
 src/server/models/Unit.js                     |  6 ++--
 src/server/routes/units.js                    | 23 ++++++++++---
 src/server/sql/unit/insert_new_unit.sql       |  4 +--
 src/server/sql/unit/update_unit.sql           |  4 ++-
 9 files changed, 105 insertions(+), 29 deletions(-)
 create mode 100644 src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql

diff --git a/src/client/app/components/meters/CreateMeterModalComponent.tsx b/src/client/app/components/meters/CreateMeterModalComponent.tsx
index 1c0ba7702..f66ba4891 100644
--- a/src/client/app/components/meters/CreateMeterModalComponent.tsx
+++ b/src/client/app/components/meters/CreateMeterModalComponent.tsx
@@ -29,6 +29,7 @@ import { useTranslate } from '../../redux/componentHooks';
 import TimeZoneSelect from '../TimeZoneSelect';
 import TooltipHelpComponent from '../TooltipHelpComponent';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
+import { selectUnitDataById } from '../../redux/api/unitsApi';
 
 interface CreateMeterModalProps {
 	onCreateMeter?: (meterIdentifier: string) => void; // Define the type of the callback function
@@ -55,6 +56,7 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 	const [meterDetails, setMeterDetails] = useState(defaultValues);
 	const unitIsSelected = meterDetails.unitId !== -999;
 	const defaultGaphicUnitIsSelected = meterDetails.defaultGraphicUnit !== -999;
+	const unitsDataById = useAppSelector(selectUnitDataById);
 
 	const { compatibleGraphicUnits, incompatibleGraphicUnits, compatibleUnits } = useAppSelector(state =>
 		// Type assertion due to conflicting GPS Property
@@ -92,6 +94,21 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 	const handleTimeZoneChange = (timeZone: string) => {
 		setMeterDetails({ ...meterDetails, ['timeZone']: timeZone });
 	};
+
+	const handleUnitChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+		const selectedUnitId = Number(e.target.value);
+		const selectedUnit = unitsDataById[selectedUnitId];
+
+		if (selectedUnit) {
+			setMeterDetails(details => ({
+				...details,
+				unitId: selectedUnitId,
+				minVal: selectedUnit.minVal,
+				maxVal: selectedUnit.maxVal
+			}));
+		}
+	};
+
 	// Reset the state to default values
 	const resetState = () => {
 		setMeterDetails(defaultValues);
@@ -245,9 +262,7 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 							</Label>
 							<Input id='unitId' name='unitId' type='select'
 								value={meterDetails.unitId}
-								onChange={e => {
-									handleNumberChange(e);
-								}}
+								onChange={handleUnitChange}
 								invalid={!unitIsSelected}>
 								<option value={-999} key={-999} hidden disabled>
 									{translate('select.unit')}
@@ -544,12 +559,12 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 					<Row xs='1' lg='2'>
 						{/* minVal input */}
 						<Col><FormGroup>
-							<Label for='minVal'>{translate('meter.minVal')}</Label>
+							<Label for='minVal'>{translate('minVal')}</Label>
 							<Input id='minVal' name='minVal' type='number'
 								onChange={e => handleNumberChange(e)}
 								min={MIN_VAL}
 								max={meterDetails.maxVal}
-								defaultValue={meterDetails.minVal}
+								value={meterDetails.minVal}
 								invalid={meterDetails?.minVal < MIN_VAL || meterDetails?.minVal > meterDetails?.maxVal} />
 							<FormFeedback>
 								<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: meterDetails.maxVal }} />
@@ -557,12 +572,12 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 						</FormGroup></Col>
 						{/* maxVal input */}
 						<Col><FormGroup>
-							<Label for='maxVal'>{translate('meter.maxVal')}</Label>
+							<Label for='maxVal'>{translate('maxVal')}</Label>
 							<Input id='maxVal' name='maxVal' type='number'
 								onChange={e => handleNumberChange(e)}
 								min={meterDetails.minVal}
 								max={MAX_VAL}
-								defaultValue={meterDetails.maxVal}
+								value={meterDetails.maxVal}
 								invalid={meterDetails?.maxVal > MAX_VAL || meterDetails?.minVal > meterDetails?.maxVal} />
 							<FormFeedback>
 								<FormattedMessage id="error.bounds" values={{ min: meterDetails.minVal, max: MAX_VAL }} />
diff --git a/src/client/app/components/unit/CreateUnitModalComponent.tsx b/src/client/app/components/unit/CreateUnitModalComponent.tsx
index 621f71b23..5175cae64 100644
--- a/src/client/app/components/unit/CreateUnitModalComponent.tsx
+++ b/src/client/app/components/unit/CreateUnitModalComponent.tsx
@@ -15,6 +15,7 @@ import { tooltipBaseStyle } from '../../styles/modalStyle';
 import { unitsApi } from '../../redux/api/unitsApi';
 import { useTranslate } from '../../redux/componentHooks';
 import { showSuccessNotification, showErrorNotification } from '../../utils/notifications';
+import { MAX_VAL,  MIN_VAL } from '../../redux/selectors/adminSelectors';
 
 /**
  * Defines the create unit modal form
@@ -38,7 +39,9 @@ export default function CreateUnitModalComponent() {
 		// The client code makes the id for the selected unit and default graphic unit be -99
 		// so it can tell it is not yet assigned and do the correct logic for that case.
 		// The units API expects these values to be undefined on call so that the database can assign their values.
-		id: -99
+		id: -99,
+		minVal: MIN_VAL,
+		maxVal: MAX_VAL
 	};
 
 	/* State */
@@ -267,6 +270,34 @@ export default function CreateUnitModalComponent() {
 							</FormFeedback>
 						</FormGroup></Col>
 					</Row>
+					<Row xs='1' lg='2'>
+						{/* minVal input */}
+						<Col><FormGroup>
+							<Label for='minVal'>{translate('minVal')}</Label>
+							<Input id='minVal' name='minVal' type='number'
+								onChange={e => handleNumberChange(e)}
+								min={MIN_VAL}
+								max={state.maxVal}
+								defaultValue={state.minVal}
+								invalid={state?.minVal < MIN_VAL || state?.minVal > state?.maxVal} />
+							<FormFeedback>
+								<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: state.maxVal }} />
+							</FormFeedback>
+						</FormGroup></Col>
+						{/* maxVal input */}
+						<Col><FormGroup>
+							<Label for='maxVal'>{translate('maxVal')}</Label>
+							<Input id='maxVal' name='maxVal' type='number'
+								onChange={e => handleNumberChange(e)}
+								min={state.minVal}
+								max={MAX_VAL}
+								defaultValue={state.maxVal}
+								invalid={state?.maxVal > MAX_VAL || state?.minVal > state?.maxVal} />
+							<FormFeedback>
+								<FormattedMessage id="error.bounds" values={{ min: state.minVal, max: MAX_VAL }} />
+							</FormFeedback>
+						</FormGroup></Col>
+					</Row>
 					{/* Note input */}
 					<FormGroup>
 						<Label for='note'>{translate('note')}</Label>
diff --git a/src/client/app/types/redux/units.ts b/src/client/app/types/redux/units.ts
index 47c31fb9f..262efaf37 100644
--- a/src/client/app/types/redux/units.ts
+++ b/src/client/app/types/redux/units.ts
@@ -31,20 +31,22 @@ export interface UnitData {
 	displayable: DisplayableType;
 	preferredDisplay: boolean;
 	note: string;
+	maxVal: number;
+	minVal: number;
 }
 
-export interface UnitEditData {
-	id: number;
-	name: string;
-	identifier: string;
-	unitRepresent: string;
-	secInRate: number;
-	typeOfUnit: UnitType;
-	suffix: string;
-	displayable: DisplayableType;
-	preferredDisplay: boolean;
-	note: string;
-}
+// export interface UnitEditData {
+// 	id: number;
+// 	name: string;
+// 	identifier: string;
+// 	unitRepresent: string;
+// 	secInRate: number;
+// 	typeOfUnit: UnitType;
+// 	suffix: string;
+// 	displayable: DisplayableType;
+// 	preferredDisplay: boolean;
+// 	note: string;
+// }
 
 export interface UnitDataById extends Record<number, UnitData> { }
 
diff --git a/src/server/migrations/1.0.0-2.0.0/index.js b/src/server/migrations/1.0.0-2.0.0/index.js
index 8444613e3..2e68ed47b 100644
--- a/src/server/migrations/1.0.0-2.0.0/index.js
+++ b/src/server/migrations/1.0.0-2.0.0/index.js
@@ -20,5 +20,6 @@ module.exports = {
         // It should not matter but first rename cik and then do units.
         await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/cik/alter_cik_table.sql'));
         await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/units/alter_units_table.sql'));
+        await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql'));
     }
 };
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql b/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql
new file mode 100644
index 000000000..b2f08c85b
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ALTER TABLE units
+    ADD COLUMN IF NOT EXISTS min_val FLOAT NOT NULL DEFAULT -9007199254740991 CHECK (min_val::FLOAT >= -9007199254740991),
+    ADD COLUMN IF NOT EXISTS max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val::FLOAT <= 9007199254740991)
+;
diff --git a/src/server/models/Unit.js b/src/server/models/Unit.js
index fff20750e..c382ff990 100644
--- a/src/server/models/Unit.js
+++ b/src/server/models/Unit.js
@@ -19,7 +19,7 @@ class Unit {
 	 * @param {*} preferredDisplay True if this unit is always displayed. If not, the user needs to ask to see (for future enhancement).
 	 * @param {*} note Note about this unit.
 	 */
-	constructor(id, name, identifier = name, unitRepresent, secInRate = 3600, typeOfUnit, suffix = '', displayable, preferredDisplay, note) {
+	constructor(id, name, identifier = name, unitRepresent, secInRate = 3600, typeOfUnit, suffix = '', displayable, preferredDisplay, note, minVal, maxVal) {
 		this.id = id;
 		this.name = name;
 		this.identifier = identifier;
@@ -30,6 +30,8 @@ class Unit {
 		this.displayable = displayable;
 		this.preferredDisplay = preferredDisplay;
 		this.note = note;
+		this.minVal = minVal;
+		this.maxVal = maxVal;
 	}
 
 	/**
@@ -39,7 +41,7 @@ class Unit {
 	 */
 	static mapRow(row) {
 		return new Unit(row.id, row.name, row.identifier, row.unit_represent, row.sec_in_rate,
-			row.type_of_unit, row.suffix, row.displayable, row.preferred_display, row.note);
+			row.type_of_unit, row.suffix, row.displayable, row.preferred_display, row.note, row.min_val, row.max_val);
 	}
 
 	/**
diff --git a/src/server/routes/units.js b/src/server/routes/units.js
index b5e9c6392..69aac366f 100644
--- a/src/server/routes/units.js
+++ b/src/server/routes/units.js
@@ -16,7 +16,7 @@ function formatUnitForResponse(item) {
 	return {
 		id: item.id, name: item.name, identifier: item.identifier, unitRepresent: item.unitRepresent,
 		secInRate: item.secInRate, typeOfUnit: item.typeOfUnit, suffix: item.suffix,
-		displayable: item.displayable, preferredDisplay: item.preferredDisplay, note: item.note
+		displayable: item.displayable, preferredDisplay: item.preferredDisplay, note: item.note, minVal: item.minVal, maxVal: item.maxVal
 	};
 }
 
@@ -77,10 +77,15 @@ router.post('/edit', async (req, res) => {
 			},
 			note: {
 				type: 'string'
+			},
+			minVal: {
+				type: 'number',
+			},
+			maxVal: {
+				type: 'number',
 			}
 		}
 	};
-
 	const validatorResult = validate(req.body, validUnit);
 	if (!validatorResult.valid) {
 		log.warn(`Got request to edit units with invalid unit data, errors:${validatorResult.errors}`);
@@ -102,6 +107,8 @@ router.post('/edit', async (req, res) => {
 			unit.secInRate = req.body.secInRate;
 			unit.suffix = req.body.suffix;
 			unit.note = req.body.note;
+			unit.minVal = req.body.minVal;
+			unit.maxVal = req.body.maxVal;
 			await unit.update(conn);
 		} catch (err) {
 			log.error('Failed to edit unit', err);
@@ -117,7 +124,7 @@ router.post('/edit', async (req, res) => {
 router.post('/addUnit', async (req, res) => {
 	const validUnit = {
 		type: 'object',
-		required: ['name', 'identifier', 'unitRepresent', 'typeOfUnit', 'displayable', 'preferredDisplay'],
+		required: ['name', 'identifier', 'unitRepresent', 'typeOfUnit', 'displayable', 'preferredDisplay', 'minVal', 'maxVal'],
 		properties: {
 			// Removed id from properties list since it is set to undefined no matter what is passed.
 			name: {
@@ -160,6 +167,12 @@ router.post('/addUnit', async (req, res) => {
 					{ type: 'string' },
 					{ type: 'null' }
 				]
+			},
+			minVal: {
+				type: 'number'
+			},
+			maxVal: {
+				type: 'number'
 			}
 		}
 	};
@@ -181,7 +194,9 @@ router.post('/addUnit', async (req, res) => {
 					req.body.suffix,
 					req.body.displayable,
 					req.body.preferredDisplay,
-					req.body.note
+					req.body.note,
+					req.body.minVal,
+					req.body.maxVal
 				);
 				await newUnit.insert(t);
 			});
diff --git a/src/server/sql/unit/insert_new_unit.sql b/src/server/sql/unit/insert_new_unit.sql
index a4805ed5e..fa8cf8c6c 100644
--- a/src/server/sql/unit/insert_new_unit.sql
+++ b/src/server/sql/unit/insert_new_unit.sql
@@ -2,6 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-INSERT INTO units(name, identifier, unit_represent, sec_in_rate, type_of_unit, suffix, displayable, preferred_display, note)
-VALUES (${name}, ${identifier}, ${unitRepresent}, ${secInRate}, ${typeOfUnit}, ${suffix}, ${displayable}, ${preferredDisplay}, ${note})
+INSERT INTO units(name, identifier, unit_represent, sec_in_rate, type_of_unit, suffix, displayable, preferred_display, note, max_val, min_val)
+VALUES (${name}, ${identifier}, ${unitRepresent}, ${secInRate}, ${typeOfUnit}, ${suffix}, ${displayable}, ${preferredDisplay}, ${note}, ${maxVal}, ${minVal})
 RETURNING id;
diff --git a/src/server/sql/unit/update_unit.sql b/src/server/sql/unit/update_unit.sql
index af3594819..b7a3bded4 100644
--- a/src/server/sql/unit/update_unit.sql
+++ b/src/server/sql/unit/update_unit.sql
@@ -11,5 +11,7 @@ UPDATE units
 		suffix = ${suffix},
 		displayable = ${displayable},
 		preferred_display = ${preferredDisplay},
-		note = ${note}
+		note = ${note},
+		max_val = ${maxVal},
+		min_val = ${minVal}
 	WHERE id = ${id};

From 8953030322285deb35f10dcf80dc6553b28f458d Mon Sep 17 00:00:00 2001
From: Joijanae Laws <joijanaelaws@Joijanaes-MacBook-Air.local>
Date: Mon, 25 Nov 2024 20:00:51 -0600
Subject: [PATCH 2/4] edit unit changes

---
 .../meters/EditMeterModalComponent.tsx        | 30 ++++++++++++++--
 .../unit/EditUnitModalComponent.tsx           | 35 ++++++++++++++++++-
 src/client/app/translations/data.ts           | 12 +++----
 src/client/app/utils/input.ts                 |  4 ++-
 .../services/csvPipeline/uploadReadings.js    |  4 +--
 src/server/services/eGauge/readEgaugeData.js  |  4 +--
 .../services/obvius/loadLogfileToReadings.js  |  4 +--
 src/server/services/readMamacData.js          |  4 +--
 src/server/util/insertData.js                 |  4 +--
 9 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index 59afc37a7..dcd4b7e55 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -67,6 +67,17 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 
 	const [validMeter, setValidMeter] = useState(isValidMeter(localMeterEdits));
 
+	useEffect(() => {
+		const selectedUnit = unitDataById[localMeterEdits.unitId];
+		if (selectedUnit) {
+			setLocalMeterEdits(edits => ({
+				...edits,
+				minVal: selectedUnit.minVal,
+				maxVal: selectedUnit.maxVal
+			}));
+		}
+	}, [localMeterEdits.unitId, unitDataById]);
+
 	useEffect(() => { setValidMeter(isValidMeter(localMeterEdits)); }, [localMeterEdits]);
 	/* End State */
 
@@ -76,6 +87,19 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 		}
 	}, [localMeterEdits.cumulative]);
 
+	const handleUnitChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+		const selectedUnitId = Number(e.target.value);
+		const selectedUnit = unitDataById[selectedUnitId];
+		if (selectedUnit) {
+			setLocalMeterEdits({
+				...localMeterEdits,
+				unitId: selectedUnitId,
+				minVal: selectedUnit.minVal,
+				maxVal: selectedUnit.maxVal
+			});
+		}
+	};
+
 	// Save changes
 	// Currently using the old functionality which is to compare inherited prop values to state values
 	// If there is a difference between props and state, then a change was made
@@ -279,7 +303,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								name='unitId'
 								type='select'
 								value={localMeterEdits.unitId}
-								onChange={e => handleNumberChange(e)}>
+								onChange={handleUnitChange}>
 								{Array.from(compatibleUnits).map(unit => {
 									return (<option value={unit.id} key={unit.id}>{unit.identifier}</option>);
 								})}
@@ -599,7 +623,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 					<Row xs='1' lg='2'>
 						{/* minVal input */}
 						<Col><FormGroup>
-							<Label for='minVal'>{translate('meter.minVal')}</Label>
+							<Label for='minVal'>{translate('minVal')}</Label>
 							<Input
 								id='minVal'
 								name='minVal'
@@ -615,7 +639,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 						</FormGroup></Col>
 						{/* maxVal input */}
 						<Col><FormGroup>
-							<Label for='maxVal'>{translate('meter.maxVal')}</Label>
+							<Label for='maxVal'>{translate('maxVal')}</Label>
 							<Input
 								id='maxVal'
 								name='maxVal'
diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 046a7e0b1..8ac574a1b 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -21,6 +21,7 @@ import { conversionArrow } from '../../utils/conversionArrow';
 import { showErrorNotification, showSuccessNotification } from '../../utils/notifications';
 import ConfirmActionModalComponent from '../ConfirmActionModalComponent';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
+import { MAX_VAL,  MIN_VAL } from '../../redux/selectors/adminSelectors';
 
 interface EditUnitModalComponentProps {
 	show: boolean;
@@ -193,7 +194,9 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 				|| props.unit.preferredDisplay != state.preferredDisplay
 				|| props.unit.secInRate != state.secInRate
 				|| props.unit.suffix != state.suffix
-				|| props.unit.note != state.note;
+				|| props.unit.note != state.note
+				|| props.unit.minVal != state.minVal
+				|| props.unit.maxVal != state.maxVal;
 		} else {
 			// Tell user that not going to update due to input issues.
 			showErrorNotification(`${translate('unit.input.error')}`);
@@ -418,6 +421,36 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 							</FormFeedback>
 						</FormGroup></Col>
 					</Row>
+					<Row xs='1' lg='2'>
+						{/* minVal input */}
+						<Col><FormGroup>
+							<Label for='minVal'>{translate('minVal')}</Label>
+							<Input id='minVal' name='minVal' type='number'
+								onChange={e => handleNumberChange(e)}
+								min={MIN_VAL}
+								max={state.maxVal}
+								defaultValue={state.minVal}
+								required value={state.minVal}
+								invalid={state?.minVal < MIN_VAL || state?.minVal > state?.maxVal} />
+							<FormFeedback>
+								<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: state.maxVal }} />
+							</FormFeedback>
+						</FormGroup></Col>
+						{/* maxVal input */}
+						<Col><FormGroup>
+							<Label for='maxVal'>{translate('maxVal')}</Label>
+							<Input id='maxVal' name='maxVal' type='number'
+								onChange={e => handleNumberChange(e)}
+								min={state.minVal}
+								max={MAX_VAL}
+								defaultValue={state.maxVal}
+								required value={state.maxVal}
+								invalid={state?.maxVal > MAX_VAL || state?.minVal > state?.maxVal} />
+							<FormFeedback>
+								<FormattedMessage id="error.bounds" values={{ min: state.minVal, max: MAX_VAL }} />
+							</FormFeedback>
+						</FormGroup></Col>
+					</Row>
 					{/* Note input */}
 					<FormGroup>
 						<Label for='note'>{translate('unit')}</Label>
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 0bc5d4ad4..32ddc0ed3 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -334,8 +334,8 @@ const LocaleTranslationData = {
 		"meter.enabled": "Updates:",
 		"meter.endOnlyTime": "Only End Times:",
 		"meter.endTimeStamp": "End Time Stamp:",
-		"meter.minVal": "Minimum Reading Value Check",
-		"meter.maxVal": "Maximum Reading Value Check",
+		"minVal": "Minimum Reading Value Check",
+		"maxVal": "Maximum Reading Value Check",
 		"meter.minDate": "Minimum Reading Date Check",
 		"meter.maxDate": "Maximum Reading Date Check",
 		"meter.maxError": "Maximum Number of Errors Check",
@@ -846,8 +846,8 @@ const LocaleTranslationData = {
 		"meter.enabled": "Mises à Jour du Mèters",
 		"meter.endOnlyTime": "End Only Time:\u{26A1}",
 		"meter.endTimeStamp": "End Time Stamp:\u{26A1}",
-		"meter.minVal": "Minimum Reading Value Check\u{26A1}",
-		"meter.maxVal": "Maximum Reading Value Check\u{26A1}",
+		"minVal": "Minimum Reading Value Check\u{26A1}",
+		"maxVal": "Maximum Reading Value Check\u{26A1}",
 		"meter.minDate": "Minimum Reading Date Check\u{26A1}",
 		"meter.maxDate": "Maximum Reading Date Check\u{26A1}",
 		"meter.maxError": "Maximum Number of Errors Check\u{26A1}",
@@ -1359,8 +1359,8 @@ const LocaleTranslationData = {
 		"meter.enabled": "Medidor activado",
 		"meter.endOnlyTime": "Solo tiempos finales.",
 		"meter.endTimeStamp": "Marca de tiempo al final:",
-		"meter.minVal": "Revisión del valor mínimo de lectura",
-		"meter.maxVal": "Revisión del valor máximo de lectura",
+		"minVal": "Revisión del valor mínimo de lectura",
+		"maxVal": "Revisión del valor máximo de lectura",
 		"meter.minDate": "Revisión de la fecha mínima de lectura",
 		"meter.maxDate": "Revisión de la fecha máxima de lectura",
 		"meter.maxError": "Revisión del número máximo de errores",
diff --git a/src/client/app/utils/input.ts b/src/client/app/utils/input.ts
index cbdeb7074..9f2152d4b 100644
--- a/src/client/app/utils/input.ts
+++ b/src/client/app/utils/input.ts
@@ -82,7 +82,9 @@ export const NoUnit: UnitData = {
 	suffix: '',
 	displayable: DisplayableType.none,
 	preferredDisplay: false,
-	note: ''
+	note: '',
+	minVal: -Infinity,
+	maxVal: Infinity
 };
 
 /**
diff --git a/src/server/services/csvPipeline/uploadReadings.js b/src/server/services/csvPipeline/uploadReadings.js
index 1bdcfd947..b6b6773a8 100644
--- a/src/server/services/csvPipeline/uploadReadings.js
+++ b/src/server/services/csvPipeline/uploadReadings.js
@@ -189,8 +189,8 @@ async function uploadReadings(req, res, filepath, conn) {
 	const mapRowToModel = row => { return row; }; // STUB function to satisfy the parameter of loadCsvInput.
 
 	const conditionSet = {
-		minVal: meter.minVal,
-		maxVal: meter.maxVal,
+		minVal: minVal,
+		maxVal: maxVal,
 		minDate: meter.minDate,
 		maxDate: meter.maxDate,
 		threshold: meter.readingGap,
diff --git a/src/server/services/eGauge/readEgaugeData.js b/src/server/services/eGauge/readEgaugeData.js
index ecdb4d0d5..f3789d52d 100644
--- a/src/server/services/eGauge/readEgaugeData.js
+++ b/src/server/services/eGauge/readEgaugeData.js
@@ -43,8 +43,8 @@ async function readEgaugeData(meter, conn) {
 		isEndOnly = false, //true
 		shouldUpdate = false,
 		conditionSet = {
-			minVal: meter.minVal,
-			maxVal: meter.maxVal,
+			minVal: minVal,
+			maxVal: maxVal,
 			minDate: meter.minDate,
 			maxDate: meter.maxDate,
 			threshold: readingGap,
diff --git a/src/server/services/obvius/loadLogfileToReadings.js b/src/server/services/obvius/loadLogfileToReadings.js
index 3c2766327..bfcade4cf 100644
--- a/src/server/services/obvius/loadLogfileToReadings.js
+++ b/src/server/services/obvius/loadLogfileToReadings.js
@@ -113,8 +113,8 @@ async function loadLogfileToReadings(serialNumber, ipAddress, logfile, conn) {
 				// Unsure if previous values should not change but going to assume want the latest one sent.
 				shouldUpdate = true,
 				conditionSet = {
-					minVal: meter.minVal,
-					maxVal: meter.maxVal,
+					minVal: minVal,
+					maxVal: maxVal,
 					minDate: meter.minDate,
 					maxDate: meter.maxDate,
 					threshold: readingGap,
diff --git a/src/server/services/readMamacData.js b/src/server/services/readMamacData.js
index 37302ceb9..686f4bea6 100644
--- a/src/server/services/readMamacData.js
+++ b/src/server/services/readMamacData.js
@@ -106,8 +106,8 @@ async function readMamacData(meter, conn) {
 		// Previous Mamac values should not change.
 		shouldUpdate = false,
 		conditionSet = {
-			minVal: meter.minVal,
-			maxVal: meter.maxVal,
+			minVal: minVal,
+			maxVal: maxVal,
 			minDate: meter.minDate,
 			maxDate: meter.maxDate,
 			threshold: readingGap,
diff --git a/src/server/util/insertData.js b/src/server/util/insertData.js
index fd416006a..af3186f58 100644
--- a/src/server/util/insertData.js
+++ b/src/server/util/insertData.js
@@ -427,8 +427,8 @@ async function insertMeters(metersToInsert, conn) {
 					await conn.none(query);
 				}
 				const conditionSet = {
-					minVal: meter.minVal,
-					maxVal: meter.maxVal,
+					minVal: minVal,
+					maxVal: maxVal,
 					minDate: meter.minDate,
 					maxDate: meter.maxDate,
 					threshold: meter.readingGap,

From a9380c9d726f04831fdc3e902b379ef332f72e2f Mon Sep 17 00:00:00 2001
From: Rakesh Ranga Buram <rakesh.rangaburam@slu.edu>
Date: Wed, 27 Nov 2024 07:18:58 -0600
Subject: [PATCH 3/4] adding coulumns to the units table

---
 src/server/sql/unit/create_units_table.sql | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/sql/unit/create_units_table.sql b/src/server/sql/unit/create_units_table.sql
index 075a35fc1..0c9e0a6ea 100644
--- a/src/server/sql/unit/create_units_table.sql
+++ b/src/server/sql/unit/create_units_table.sql
@@ -12,5 +12,7 @@ CREATE TABLE IF NOT EXISTS units (
 	suffix VARCHAR(50) DEFAULT '',
 	displayable displayable_type NOT NULL,
 	preferred_display BOOLEAN NOT NULL,
-	note TEXT
+	note TEXT,
+	min_val FLOAT NOT NULL DEFAULT -9007199254740991 CHECK (min_val::FLOAT >= -9007199254740991),
+    max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val::FLOAT <= 9007199254740991)
 );

From e72f18e79eb4ae173716dfb72e4ec1df3ea6641e Mon Sep 17 00:00:00 2001
From: Rakesh Ranga Buram <rakesh.rangaburam@slu.edu>
Date: Wed, 4 Dec 2024 20:52:16 -0600
Subject: [PATCH 4/4] Disable changes

---
 .../meters/CreateMeterModalComponent.tsx      | 21 ++++++++--------
 .../meters/EditMeterModalComponent.tsx        | 17 ++++++-------
 .../unit/CreateUnitModalComponent.tsx         | 19 +++++++++++++--
 .../unit/EditUnitModalComponent.tsx           | 21 ++++++++++++----
 .../app/redux/selectors/adminSelectors.ts     |  4 ++--
 src/client/app/redux/slices/adminSlice.ts     |  5 ++--
 src/client/app/translations/data.ts           | 15 +++++++++---
 src/client/app/types/items.ts                 |  4 ++--
 src/client/app/types/redux/admin.ts           |  3 ++-
 src/client/app/types/redux/meters.ts          |  3 ++-
 src/client/app/types/redux/units.ts           |  6 +++++
 src/client/app/utils/input.ts                 |  5 ++--
 src/server/migrations/1.0.0-2.0.0/index.js    |  2 ++
 .../sql/meter/alter_meter_disable_checks.sql  | 24 +++++++++++++++++++
 .../sql/units/add_disable_checks_types.sql    | 10 ++++++++
 .../units/alter_units_table_add_columns.sql   |  3 ++-
 src/server/models/Meter.js                    | 16 ++++++++++++-
 src/server/models/Unit.js                     | 20 ++++++++++++++--
 src/server/models/database.js                 |  2 ++
 src/server/routes/meters.js                   |  9 +++++--
 src/server/routes/units.js                    | 18 +++++++++++---
 .../services/csvPipeline/uploadReadings.js    |  2 +-
 src/server/services/eGauge/readEgaugeData.js  |  2 +-
 .../services/obvius/loadLogfileToReadings.js  |  2 +-
 src/server/services/readMamacData.js          |  2 +-
 src/server/sql/meter/create_meters_table.sql  |  2 +-
 .../unit/create_disable_checks_types_enum.sql | 11 +++++++++
 src/server/sql/unit/create_units_table.sql    |  3 ++-
 src/server/sql/unit/insert_new_unit.sql       |  4 ++--
 src/server/sql/unit/update_unit.sql           |  3 ++-
 src/server/util/insertData.js                 |  2 +-
 31 files changed, 203 insertions(+), 57 deletions(-)
 create mode 100644 src/server/migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql
 create mode 100644 src/server/migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql
 create mode 100644 src/server/sql/unit/create_disable_checks_types_enum.sql

diff --git a/src/client/app/components/meters/CreateMeterModalComponent.tsx b/src/client/app/components/meters/CreateMeterModalComponent.tsx
index f66ba4891..7cb1ac78c 100644
--- a/src/client/app/components/meters/CreateMeterModalComponent.tsx
+++ b/src/client/app/components/meters/CreateMeterModalComponent.tsx
@@ -30,6 +30,7 @@ import TimeZoneSelect from '../TimeZoneSelect';
 import TooltipHelpComponent from '../TooltipHelpComponent';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
 import { selectUnitDataById } from '../../redux/api/unitsApi';
+import { DisableChecksType } from '../../types/redux/units';
 
 interface CreateMeterModalProps {
 	onCreateMeter?: (meterIdentifier: string) => void; // Define the type of the callback function
@@ -104,7 +105,8 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 				...details,
 				unitId: selectedUnitId,
 				minVal: selectedUnit.minVal,
-				maxVal: selectedUnit.maxVal
+				maxVal: selectedUnit.maxVal,
+				disableChecks: selectedUnit.disableChecks
 			}));
 		}
 	};
@@ -632,17 +634,14 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 							</FormFeedback>
 						</FormGroup></Col>
 						<Col><FormGroup>
-							<Label for='disableChecks'>{translate('meter.disableChecks')}</Label>
+							<Label for='disableChecks'>{translate('disableChecks')}</Label>
 							<Input id='disableChecks' name='disableChecks' type='select'
-								defaultValue={meterDetails.disableChecks?.toString()}
-								onChange={e => handleBooleanChange(e)}>
-								{
-									Object.keys(TrueFalseType).map(key =>
-										<option value={key} key={key}>
-											{translate(`TrueFalseType.${key}`)}
-										</option>
-									)
-								}
+								value={meterDetails.disableChecks}
+								onChange={e => handleStringChange(e)}>
+								{Object.keys(DisableChecksType).map(key => {
+									return (<option value={key} key={key} >
+										{translate(`DisableChecksType.${key}`)}</option>);
+								})}
 							</Input>
 						</FormGroup></Col>
 					</Row>
diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index dcd4b7e55..30e8c315b 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -21,7 +21,7 @@ import '../../styles/modal.css';
 import { tooltipBaseStyle } from '../../styles/modalStyle';
 import { TrueFalseType } from '../../types/items';
 import { MeterData, MeterTimeSortType, MeterType } from '../../types/redux/meters';
-import { UnitRepresentType } from '../../types/redux/units';
+import { DisableChecksType, UnitRepresentType } from '../../types/redux/units';
 import { GPSPoint, isValidGPSInput } from '../../utils/calibration';
 import { AreaUnitType } from '../../utils/getAreaUnitConversion';
 import { getGPSString, nullToEmptyString } from '../../utils/input';
@@ -95,7 +95,8 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				...localMeterEdits,
 				unitId: selectedUnitId,
 				minVal: selectedUnit.minVal,
-				maxVal: selectedUnit.maxVal
+				maxVal: selectedUnit.maxVal,
+				disableChecks: selectedUnit.disableChecks
 			});
 		}
 	};
@@ -711,16 +712,16 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 						</FormGroup></Col>
 						{/* DisableChecks input */}
 						<Col><FormGroup>
-							<Label for='disableChecks'>{translate('meter.disableChecks')}</Label>
+							<Label for='disableChecks'>{translate('disableChecks')}</Label>
 							<Input
 								id='disableChecks'
 								name='disableChecks'
 								type='select'
-								value={localMeterEdits?.disableChecks?.toString()}
-								onChange={e => handleBooleanChange(e)}
-								invalid={localMeterEdits?.disableChecks && localMeterEdits.unitId === -99}>
-								{Object.keys(TrueFalseType).map(key => {
-									return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>);
+								value={localMeterEdits.disableChecks}
+								onChange={e => handleStringChange(e)}>
+								{Object.keys(DisableChecksType).map(key => {
+									return (<option value={key} key={key} >
+										{translate(`DisableChecksType.${key}`)}</option>);
 								})}
 							</Input>
 						</FormGroup></Col>
diff --git a/src/client/app/components/unit/CreateUnitModalComponent.tsx b/src/client/app/components/unit/CreateUnitModalComponent.tsx
index 5175cae64..deff0c29d 100644
--- a/src/client/app/components/unit/CreateUnitModalComponent.tsx
+++ b/src/client/app/components/unit/CreateUnitModalComponent.tsx
@@ -10,7 +10,7 @@ import '../../styles/modal.css';
 import { TrueFalseType } from '../../types/items';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
 import TooltipHelpComponent from '../../components/TooltipHelpComponent';
-import { UnitRepresentType, DisplayableType, UnitType } from '../../types/redux/units';
+import { UnitRepresentType, DisplayableType, UnitType, DisableChecksType } from '../../types/redux/units';
 import { tooltipBaseStyle } from '../../styles/modalStyle';
 import { unitsApi } from '../../redux/api/unitsApi';
 import { useTranslate } from '../../redux/componentHooks';
@@ -41,7 +41,8 @@ export default function CreateUnitModalComponent() {
 		// The units API expects these values to be undefined on call so that the database can assign their values.
 		id: -99,
 		minVal: MIN_VAL,
-		maxVal: MAX_VAL
+		maxVal: MAX_VAL,
+		disableChecks: DisableChecksType.reject_none
 	};
 
 	/* State */
@@ -298,6 +299,20 @@ export default function CreateUnitModalComponent() {
 							</FormFeedback>
 						</FormGroup></Col>
 					</Row>
+					<Row xs='1' lg='2'>
+						{/* DisableChecks input */}
+						<Col><FormGroup>
+							<Label for='disableChecks'>{translate('disableChecks')}</Label>
+							<Input id='disableChecks' name='disableChecks' type='select'
+								onChange={e => handleStringChange(e)}
+								defaultValue={state.disableChecks}>
+								{Object.keys(DisableChecksType).map(key => {
+									return (<option value={key} key={key} >
+										{translate(`DisableChecksType.${key}`)}</option>);
+								})}
+							</Input>
+						</FormGroup></Col>
+					</Row>
 					{/* Note input */}
 					<FormGroup>
 						<Label for='note'>{translate('note')}</Label>
diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 8ac574a1b..a8a2072f0 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -16,7 +16,7 @@ import { useAppSelector } from '../../redux/reduxHooks';
 import '../../styles/modal.css';
 import { tooltipBaseStyle } from '../../styles/modalStyle';
 import { TrueFalseType } from '../../types/items';
-import { DisplayableType, UnitData, UnitRepresentType, UnitType } from '../../types/redux/units';
+import { DisableChecksType, DisplayableType, UnitData, UnitRepresentType, UnitType } from '../../types/redux/units';
 import { conversionArrow } from '../../utils/conversionArrow';
 import { showErrorNotification, showSuccessNotification } from '../../utils/notifications';
 import ConfirmActionModalComponent from '../ConfirmActionModalComponent';
@@ -196,7 +196,8 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 				|| props.unit.suffix != state.suffix
 				|| props.unit.note != state.note
 				|| props.unit.minVal != state.minVal
-				|| props.unit.maxVal != state.maxVal;
+				|| props.unit.maxVal != state.maxVal
+				|| props.unit.disableChecks != state.disableChecks;
 		} else {
 			// Tell user that not going to update due to input issues.
 			showErrorNotification(`${translate('unit.input.error')}`);
@@ -429,7 +430,6 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 								onChange={e => handleNumberChange(e)}
 								min={MIN_VAL}
 								max={state.maxVal}
-								defaultValue={state.minVal}
 								required value={state.minVal}
 								invalid={state?.minVal < MIN_VAL || state?.minVal > state?.maxVal} />
 							<FormFeedback>
@@ -443,7 +443,6 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 								onChange={e => handleNumberChange(e)}
 								min={state.minVal}
 								max={MAX_VAL}
-								defaultValue={state.maxVal}
 								required value={state.maxVal}
 								invalid={state?.maxVal > MAX_VAL || state?.minVal > state?.maxVal} />
 							<FormFeedback>
@@ -451,6 +450,20 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 							</FormFeedback>
 						</FormGroup></Col>
 					</Row>
+					<Row xs='1' lg='2'>
+						{/* DisableChecks input */}
+						<Col><FormGroup>
+							<Label for='disableChecks'>{translate('disableChecks')}</Label>
+							<Input id='disableChecks' name='disableChecks' type='select'
+								onChange={e => handleStringChange(e)}
+								value={state.disableChecks}>
+								{Object.keys(DisableChecksType).map(key => {
+									return (<option value={key} key={key} >
+										{translate(`DisableChecksType.${key}`)}</option>);
+								})}
+							</Input>
+						</FormGroup></Col>
+					</Row>
 					{/* Note input */}
 					<FormGroup>
 						<Label for='note'>{translate('unit')}</Label>
diff --git a/src/client/app/redux/selectors/adminSelectors.ts b/src/client/app/redux/selectors/adminSelectors.ts
index eaefebe3e..e11bfcf6e 100644
--- a/src/client/app/redux/selectors/adminSelectors.ts
+++ b/src/client/app/redux/selectors/adminSelectors.ts
@@ -9,7 +9,7 @@ import { selectAllMeters, selectMeterById } from '../../redux/api/metersApi';
 import { selectAdminPreferences } from '../../redux/slices/adminSlice';
 import { ConversionData } from '../../types/redux/conversions';
 import { MeterData, MeterTimeSortType } from '../../types/redux/meters';
-import { UnitData, UnitType } from '../../types/redux/units';
+import { DisableChecksType, UnitData, UnitType } from '../../types/redux/units';
 import { unitsCompatibleWithUnit } from '../../utils/determineCompatibleUnits';
 import { AreaUnitType } from '../../utils/getAreaUnitConversion';
 import { noUnitTranslated, potentialGraphicUnits } from '../../utils/input';
@@ -312,7 +312,7 @@ export const selectDefaultCreateMeterValues = createAppSelector(
 			minDate: adminPreferences.defaultMeterMinimumDate,
 			maxDate: adminPreferences.defaultMeterMaximumDate,
 			maxError: adminPreferences.defaultMeterMaximumErrors,
-			disableChecks: adminPreferences.defaultMeterDisableChecks
+			disableChecks: DisableChecksType.reject_none
 		};
 		return defaultValues;
 	}
diff --git a/src/client/app/redux/slices/adminSlice.ts b/src/client/app/redux/slices/adminSlice.ts
index 932b01d8d..85d9bf103 100644
--- a/src/client/app/redux/slices/adminSlice.ts
+++ b/src/client/app/redux/slices/adminSlice.ts
@@ -13,6 +13,7 @@ import { durationFormat } from '../../utils/durationFormat';
 import { AreaUnitType } from '../../utils/getAreaUnitConversion';
 import { preferencesApi } from '../api/preferencesApi';
 import { selectOEDVersion } from '../../redux/api/versionApi';
+import { DisableChecksType } from '../../types/redux/units';
 
 export const defaultAdminState: AdminState = {
 	displayTitle: '',
@@ -34,7 +35,7 @@ export const defaultAdminState: AdminState = {
 	defaultMeterMaximumDate: moment(0).utc().add(5000, 'years').format('YYYY-MM-DD HH:mm:ssZ'),
 	defaultMeterReadingGap: 0,
 	defaultMeterMaximumErrors: 75,
-	defaultMeterDisableChecks: false,
+	defaultMeterDisableChecks: DisableChecksType.reject_none,
 	defaultHelpUrl: ''
 };
 
@@ -127,7 +128,7 @@ export const adminSlice = createSlice({
 			state.defaultMeterMaximumErrors = action.payload;
 			state.submitted = false;
 		},
-		updateDefaultMeterDisableChecks: (state, action: PayloadAction<boolean>) => {
+		updateDefaultMeterDisableChecks: (state, action: PayloadAction<DisableChecksType>) => {
 			state.defaultMeterDisableChecks = action.payload;
 			state.submitted = false;
 		},
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index fd51bfa70..d1349b75f 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -344,7 +344,10 @@ const LocaleTranslationData = {
 		"meter.minDate": "Minimum Reading Date Check",
 		"meter.maxDate": "Maximum Reading Date Check",
 		"meter.maxError": "Maximum Number of Errors Check",
-		"meter.disableChecks": "Disable Checks",
+		"disableChecks": "Disable Checks",
+		"DisableChecksType.reject_bad": "No, only reject the bad reading(s)",
+		"DisableChecksType.reject_all": "No, reject all readings in batch",
+		"DisableChecksType.reject_none": "Yes, do not check values",
 		"meter.failed.to.create.meter": "Failed to create a meter with message: ",
 		"meter.failed.to.edit.meter": "Failed to edit meter with message: ",
 		"meter.hidden": "At least one meter is not visible to you",
@@ -865,7 +868,10 @@ const LocaleTranslationData = {
 		"meter.minDate": "Minimum Reading Date Check\u{26A1}",
 		"meter.maxDate": "Maximum Reading Date Check\u{26A1}",
 		"meter.maxError": "Maximum Number of Errors Check\u{26A1}",
-		"meter.disableChecks": "Disable Checks\u{26A1}",
+		"disableChecks": "Disable Checks\u{26A1}",
+		"DisableChecksType.reject_bad": "No, only reject the bad reading(s)\u{26A1}",
+		"DisableChecksType.reject_all": "No, reject all readings in batch\u{26A1}",
+		"DisableChecksType.reject_none": "Yes, do not check values\u{26A1}",
 		"meter.failed.to.create.meter": "Failed to create a meter with message: \u{26A1}",
 		"meter.failed.to.edit.meter": "Failed to edit meter with message: \u{26A1}",
 		"meter.hidden": "At least one meter is not visible to you\u{26A1}",
@@ -1387,7 +1393,10 @@ const LocaleTranslationData = {
 		"meter.minDate": "Revisión de la fecha mínima de lectura",
 		"meter.maxDate": "Revisión de la fecha máxima de lectura",
 		"meter.maxError": "Revisión del número máximo de errores",
-		"meter.disableChecks": "Desactivar revisiones",
+		"disableChecks": "Desactivar revisiones",
+		"DisableChecksType.reject_bad": "No, only reject the bad reading(s)\u{26A1}",
+		"DisableChecksType.reject_all": "No, reject all readings in batch\u{26A1}",
+		"DisableChecksType.reject_none": "Yes, do not check values\u{26A1}",
 		"meter.failed.to.create.meter": "No se pudo crear un medidor con mensaje: ",
 		"meter.failed.to.edit.meter": "No se pudo editar un medidor con mensaje: ",
 		"meter.hidden": "Al menos un medidor no es visible para tí.",
diff --git a/src/client/app/types/items.ts b/src/client/app/types/items.ts
index 7c0907b84..5a1c91246 100644
--- a/src/client/app/types/items.ts
+++ b/src/client/app/types/items.ts
@@ -7,7 +7,7 @@ import { LanguageTypes } from './redux/i18n';
 import { AreaUnitType } from '../utils/getAreaUnitConversion';
 import { MeterData } from './redux/meters';
 import { GroupData } from './redux/groups';
-import { UnitData } from './redux/units';
+import { DisableChecksType, UnitData } from './redux/units';
 
 /**
  * The type of options displayed in Select components.
@@ -63,7 +63,7 @@ export interface PreferenceRequestItem {
 	defaultMeterMaximumDate: string;
 	defaultMeterReadingGap: number;
 	defaultMeterMaximumErrors: number;
-	defaultMeterDisableChecks: boolean;
+	defaultMeterDisableChecks: DisableChecksType;
 	defaultHelpUrl: string;
 }
 
diff --git a/src/client/app/types/redux/admin.ts b/src/client/app/types/redux/admin.ts
index 989d3f29f..d7ae1a5b1 100644
--- a/src/client/app/types/redux/admin.ts
+++ b/src/client/app/types/redux/admin.ts
@@ -5,6 +5,7 @@
 import { ChartTypes } from './graph';
 import { LanguageTypes } from './i18n';
 import { AreaUnitType } from '../../utils/getAreaUnitConversion';
+import { DisableChecksType } from './units';
 
 
 export interface AdminState {
@@ -27,6 +28,6 @@ export interface AdminState {
 	defaultMeterMaximumDate: string;
 	defaultMeterReadingGap: number;
 	defaultMeterMaximumErrors: number;
-	defaultMeterDisableChecks: boolean;
+	defaultMeterDisableChecks: DisableChecksType;
 	defaultHelpUrl: string;
 }
diff --git a/src/client/app/types/redux/meters.ts b/src/client/app/types/redux/meters.ts
index d5490568e..fa3bd6a84 100644
--- a/src/client/app/types/redux/meters.ts
+++ b/src/client/app/types/redux/meters.ts
@@ -4,6 +4,7 @@
 import { GPSPoint } from 'utils/calibration';
 // import { ActionType } from './actions';
 import { AreaUnitType } from 'utils/getAreaUnitConversion';
+import { DisableChecksType } from './units';
 
 // The relates to the JS object Meter.types for the same use in src/server/models/Meter.js.
 // They should be kept in sync.
@@ -56,7 +57,7 @@ export interface MeterData {
 	minDate: string;
 	maxDate: string;
 	maxError: number;
-	disableChecks: boolean;
+	disableChecks: DisableChecksType;
 }
 
 export interface MeterDataByID extends Record<number, MeterData> { }
diff --git a/src/client/app/types/redux/units.ts b/src/client/app/types/redux/units.ts
index 262efaf37..a4a341f9d 100644
--- a/src/client/app/types/redux/units.ts
+++ b/src/client/app/types/redux/units.ts
@@ -20,6 +20,11 @@ export enum UnitRepresentType {
 	raw = 'raw'
 }
 
+export enum DisableChecksType {
+	reject_bad = 'reject_bad',
+	reject_all = 'reject_all',
+	reject_none = 'reject_none'
+}
 export interface UnitData {
 	id: number;
 	name: string;
@@ -33,6 +38,7 @@ export interface UnitData {
 	note: string;
 	maxVal: number;
 	minVal: number;
+	disableChecks: DisableChecksType;
 }
 
 // export interface UnitEditData {
diff --git a/src/client/app/utils/input.ts b/src/client/app/utils/input.ts
index 9f2152d4b..95c35ed17 100644
--- a/src/client/app/utils/input.ts
+++ b/src/client/app/utils/input.ts
@@ -3,7 +3,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { GPSPoint } from './calibration';
-import { UnitData, DisplayableType, UnitRepresentType, UnitType, UnitDataById } from '../types/redux/units';
+import { UnitData, DisplayableType, UnitRepresentType, UnitType, UnitDataById, DisableChecksType } from '../types/redux/units';
 import translate from './translate';
 import { LanguageTypes } from 'types/redux/i18n';
 /**
@@ -84,7 +84,8 @@ export const NoUnit: UnitData = {
 	preferredDisplay: false,
 	note: '',
 	minVal: -Infinity,
-	maxVal: Infinity
+	maxVal: Infinity,
+	disableChecks: DisableChecksType.reject_none
 };
 
 /**
diff --git a/src/server/migrations/1.0.0-2.0.0/index.js b/src/server/migrations/1.0.0-2.0.0/index.js
index 2e68ed47b..0ff05514e 100644
--- a/src/server/migrations/1.0.0-2.0.0/index.js
+++ b/src/server/migrations/1.0.0-2.0.0/index.js
@@ -21,5 +21,7 @@ module.exports = {
         await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/cik/alter_cik_table.sql'));
         await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/units/alter_units_table.sql'));
         await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql'));
+        await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql'));
+        await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql'));
     }
 };
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql b/src/server/migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql
new file mode 100644
index 000000000..9c8e5f557
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- Add a temporary column with the new type
+ALTER TABLE meters 
+    ADD COLUMN disable_checks_temp disable_checks_type NOT NULL DEFAULT 'reject_none';
+
+-- Update the temporary column based on the current boolean values in disable_checks
+UPDATE meters
+SET disable_checks_temp = 
+    CASE 
+        WHEN disable_checks = true THEN 'reject_none'::disable_checks_type
+        WHEN disable_checks = false THEN 'reject_all'::disable_checks_type
+    END;
+
+-- Drop the old column
+ALTER TABLE meters 
+    DROP COLUMN disable_checks;
+
+-- Rename the temporary column to the original column name
+ALTER TABLE meters 
+    RENAME COLUMN disable_checks_temp TO disable_checks;
+
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql b/src/server/migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql
new file mode 100644
index 000000000..139f4ee3f
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql
@@ -0,0 +1,10 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+DO $$ BEGIN 
+	CREATE TYPE disable_checks_type AS ENUM('reject_bad', 'reject_all', 'reject_none');
+EXCEPTION
+	WHEN duplicate_object THEN null;
+END $$;
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql b/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql
index b2f08c85b..ca6b9fa32 100644
--- a/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql
+++ b/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql
@@ -4,5 +4,6 @@
 
 ALTER TABLE units
     ADD COLUMN IF NOT EXISTS min_val FLOAT NOT NULL DEFAULT -9007199254740991 CHECK (min_val::FLOAT >= -9007199254740991),
-    ADD COLUMN IF NOT EXISTS max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val::FLOAT <= 9007199254740991)
+    ADD COLUMN IF NOT EXISTS max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val::FLOAT <= 9007199254740991),
+    ADD COLUMN IF NOT EXISTS disable_checks disable_checks_type NOT NULL DEFAULT 'reject_none'
 ;
diff --git a/src/server/models/Meter.js b/src/server/models/Meter.js
index a8a7dcd36..fb07506dd 100644
--- a/src/server/models/Meter.js
+++ b/src/server/models/Meter.js
@@ -60,7 +60,7 @@ class Meter {
 		reading = 0.0, startTimestamp = moment(0).utc().format('YYYY-MM-DD HH:mm:ssZ'), endTimestamp = moment(0).utc().format('YYYY-MM-DD HH:mm:ssZ'),
 		previousEnd = moment(0).utc(), unitId = -99, defaultGraphicUnit = -99, areaUnit = Unit.areaUnitType.NONE, readingFrequency = '00:15:00',
 		minVal = Number.MIN_SAFE_INTEGER, maxVal = Number.MAX_SAFE_INTEGER, minDate = moment(0).utc().format('YYYY-MM-DD HH:mm:ssZ'),
-		maxDate = moment(0).utc().add(5000, 'years').format('YYYY-MM-DD HH:mm:ssZ'), maxError = 75, disableChecks = false) {
+		maxDate = moment(0).utc().add(5000, 'years').format('YYYY-MM-DD HH:mm:ssZ'), maxError = 75, disableChecks) {
 		// In order for the CSV pipeline to work, the order of the parameters needs to match the order that the fields are declared.
 		// In addition, each new parameter has to be added at the very end.
 		this.id = id;
@@ -313,6 +313,14 @@ class Meter {
 		return Reading.getAllByMeterID(this.id, conn);
 	}
 
+	/**
+	 * Returns a promise to create the disableChecksType enum of reject_bad, reject_all, and reject_none.
+	 * @param {*} conn The connection to use.
+	 * @returns {Promise.<>}
+	 */
+	static createDisableChecksTypesEnum(conn) {
+		return conn.none(sqlFile('unit/create_disable_checks_types_enum.sql'));
+	}
 	/**
 	 * Makes the given meter valid.
 	 * @param {*} meter The meter.
@@ -348,6 +356,12 @@ class Meter {
 	}
 }
 
+Meter.disableChecksType = Object.freeze({
+	REJECT_BAD: 'reject_bad',
+	REJECT_ALL: 'reject_all',
+	REJECT_NONE: 'reject_none'
+});
+
 // The relates to the TS object MeterType for the same use in src/client/app/types/redux/meters.ts.
 // They should be kept in sync.
 // Enum of meter types
diff --git a/src/server/models/Unit.js b/src/server/models/Unit.js
index c382ff990..63faedd49 100644
--- a/src/server/models/Unit.js
+++ b/src/server/models/Unit.js
@@ -19,7 +19,7 @@ class Unit {
 	 * @param {*} preferredDisplay True if this unit is always displayed. If not, the user needs to ask to see (for future enhancement).
 	 * @param {*} note Note about this unit.
 	 */
-	constructor(id, name, identifier = name, unitRepresent, secInRate = 3600, typeOfUnit, suffix = '', displayable, preferredDisplay, note, minVal, maxVal) {
+	constructor(id, name, identifier = name, unitRepresent, secInRate = 3600, typeOfUnit, suffix = '', displayable, preferredDisplay, note, minVal, maxVal, disableChecks) {
 		this.id = id;
 		this.name = name;
 		this.identifier = identifier;
@@ -32,6 +32,7 @@ class Unit {
 		this.note = note;
 		this.minVal = minVal;
 		this.maxVal = maxVal;
+		this.disableChecks = disableChecks;
 	}
 
 	/**
@@ -41,7 +42,7 @@ class Unit {
 	 */
 	static mapRow(row) {
 		return new Unit(row.id, row.name, row.identifier, row.unit_represent, row.sec_in_rate,
-			row.type_of_unit, row.suffix, row.displayable, row.preferred_display, row.note, row.min_val, row.max_val);
+			row.type_of_unit, row.suffix, row.displayable, row.preferred_display, row.note, row.min_val, row.max_val, row.disable_checks);
 	}
 
 	/**
@@ -80,6 +81,15 @@ class Unit {
 		return conn.none(sqlFile('unit/create_displayable_types_enum.sql'));
 	}
 
+	/**
+	 * Returns a promise to create the disableChecksType enum of reject_bad, reject_all, and reject_none.
+	 * @param {*} conn The connection to use.
+	 * @returns {Promise.<>}
+	 */
+	static createDisableChecksTypesEnum(conn) {
+		return conn.none(sqlFile('unit/create_disable_checks_types_enum.sql'));
+	}
+
 	/**
 	 * Returns a promise to create the unitRepresentType enum of quantity, flow and raw.
 	 * @param {*} conn The connection to use.
@@ -244,6 +254,12 @@ Unit.displayableType = Object.freeze({
 	ADMIN: 'admin'
 });
 
+Unit.disableChecksType = Object.freeze({
+	REJECT_BAD: 'reject_bad',
+	REJECT_ALL: 'reject_all',
+	REJECT_NONE: 'reject_none'
+});
+
 Unit.unitRepresentType = Object.freeze({
 	QUANTITY: 'quantity',
 	FLOW: 'flow',
diff --git a/src/server/models/database.js b/src/server/models/database.js
index 50ef1de89..8dc4cf897 100644
--- a/src/server/models/database.js
+++ b/src/server/models/database.js
@@ -89,11 +89,13 @@ async function createSchema(conn) {
 	await Unit.createUnitTypesEnum(conn);
 	await Unit.createAreaUnitTypesEnum(conn);
 	await Unit.createDisplayableTypesEnum(conn);
+	await Unit.createDisableChecksTypesEnum(conn);
 	await Unit.createUnitRepresentTypesEnum(conn);
 	await Unit.createTable(conn);
 	await Conversion.createTable(conn);
 	await Cik.createTable(conn);
 	await Meter.createMeterTypesEnum(conn);
+	await Meter.createDisableChecksTypesEnum(conn);
 	// This sql code creates a function to check meter's timezone.
 	// It needs to be called before meter table is created.
 	await conn.none(sqlFile('meter/check_timezone.sql'));
diff --git a/src/server/routes/meters.js b/src/server/routes/meters.js
index 5bd411ca5..68ea01c50 100644
--- a/src/server/routes/meters.js
+++ b/src/server/routes/meters.js
@@ -63,7 +63,7 @@ function formatMeterForResponse(meter, hasFullAccess) {
 		minDate: null,
 		maxDate: null,
 		maxError: null,
-		disableChecks: null,
+		disableChecks: meter.disableChecks,
 	};
 
 	// Only logged in Admins can see url, types, timezones, and internal names
@@ -246,7 +246,11 @@ function validateMeterParams(params) {
 			minDate: { type: 'string' },
 			maxDate: { type: 'string' },
 			maxError: { type: 'integer' },
-			disableChecks: { type: 'bool' },
+			disableChecks: {
+				type: 'string',
+				minLength: 1,
+				enum: Object.values(Meter.disableChecksType)
+			}
 		}
 	}
 	const paramsValidationResult = validate(params, validParams);
@@ -262,6 +266,7 @@ router.post('/edit', requiredAdmin('edit meters'), async (req, res) => {
 		const conn = getConnection();
 		try {
 			const meter = await Meter.getByID(req.body.id, conn);
+			console.log(req.body);
 			const updatedMeter = new Meter(
 				undefined, // id
 				req.body.name,
diff --git a/src/server/routes/units.js b/src/server/routes/units.js
index 69aac366f..39a883d74 100644
--- a/src/server/routes/units.js
+++ b/src/server/routes/units.js
@@ -16,7 +16,7 @@ function formatUnitForResponse(item) {
 	return {
 		id: item.id, name: item.name, identifier: item.identifier, unitRepresent: item.unitRepresent,
 		secInRate: item.secInRate, typeOfUnit: item.typeOfUnit, suffix: item.suffix,
-		displayable: item.displayable, preferredDisplay: item.preferredDisplay, note: item.note, minVal: item.minVal, maxVal: item.maxVal
+		displayable: item.displayable, preferredDisplay: item.preferredDisplay, note: item.note, minVal: item.minVal, maxVal: item.maxVal, disableChecks: item.disableChecks
 	};
 }
 
@@ -83,6 +83,11 @@ router.post('/edit', async (req, res) => {
 			},
 			maxVal: {
 				type: 'number',
+			},
+			disableChecks: {
+				type: 'string',
+				minLength: 1,
+				enum: Object.values(Unit.disableChecksType)
 			}
 		}
 	};
@@ -109,6 +114,7 @@ router.post('/edit', async (req, res) => {
 			unit.note = req.body.note;
 			unit.minVal = req.body.minVal;
 			unit.maxVal = req.body.maxVal;
+			unit.disableChecks = req.body.disableChecks;
 			await unit.update(conn);
 		} catch (err) {
 			log.error('Failed to edit unit', err);
@@ -124,7 +130,7 @@ router.post('/edit', async (req, res) => {
 router.post('/addUnit', async (req, res) => {
 	const validUnit = {
 		type: 'object',
-		required: ['name', 'identifier', 'unitRepresent', 'typeOfUnit', 'displayable', 'preferredDisplay', 'minVal', 'maxVal'],
+		required: ['name', 'identifier', 'unitRepresent', 'typeOfUnit', 'displayable', 'preferredDisplay', 'minVal', 'maxVal', 'disableChecks'],
 		properties: {
 			// Removed id from properties list since it is set to undefined no matter what is passed.
 			name: {
@@ -173,6 +179,11 @@ router.post('/addUnit', async (req, res) => {
 			},
 			maxVal: {
 				type: 'number'
+			},
+			disableChecks: {
+				type: 'string',
+				minLength: 1,
+				enum: Object.values(Unit.disableChecksType)
 			}
 		}
 	};
@@ -196,7 +207,8 @@ router.post('/addUnit', async (req, res) => {
 					req.body.preferredDisplay,
 					req.body.note,
 					req.body.minVal,
-					req.body.maxVal
+					req.body.maxVal,
+					req.body.disableChecks
 				);
 				await newUnit.insert(t);
 			});
diff --git a/src/server/services/csvPipeline/uploadReadings.js b/src/server/services/csvPipeline/uploadReadings.js
index b6b6773a8..c7917d927 100644
--- a/src/server/services/csvPipeline/uploadReadings.js
+++ b/src/server/services/csvPipeline/uploadReadings.js
@@ -195,7 +195,7 @@ async function uploadReadings(req, res, filepath, conn) {
 		maxDate: meter.maxDate,
 		threshold: meter.readingGap,
 		maxError: meter.maxError,
-		disableChecks: meter.disableChecks
+		disableChecks: disableChecks
 	}
 
 	return await loadCsvInput(
diff --git a/src/server/services/eGauge/readEgaugeData.js b/src/server/services/eGauge/readEgaugeData.js
index f3789d52d..242ea7ec3 100644
--- a/src/server/services/eGauge/readEgaugeData.js
+++ b/src/server/services/eGauge/readEgaugeData.js
@@ -49,7 +49,7 @@ async function readEgaugeData(meter, conn) {
 			maxDate: meter.maxDate,
 			threshold: readingGap,
 			maxError: meter.maxError,
-			disableChecks: meter.disableChecks
+			disableChecks: disableChecks
 		},
 		conn = conn,
 		// eGauge uses Unix timestamps and deals with DST.
diff --git a/src/server/services/obvius/loadLogfileToReadings.js b/src/server/services/obvius/loadLogfileToReadings.js
index bfcade4cf..e7b2857ed 100644
--- a/src/server/services/obvius/loadLogfileToReadings.js
+++ b/src/server/services/obvius/loadLogfileToReadings.js
@@ -119,7 +119,7 @@ async function loadLogfileToReadings(serialNumber, ipAddress, logfile, conn) {
 					maxDate: meter.maxDate,
 					threshold: readingGap,
 					maxError: meter.maxError,
-					disableChecks: meter.disableChecks
+					disableChecks: disableChecks
 				},
 				conn = conn,
 				honorDst = false,
diff --git a/src/server/services/readMamacData.js b/src/server/services/readMamacData.js
index 686f4bea6..5d36e35aa 100644
--- a/src/server/services/readMamacData.js
+++ b/src/server/services/readMamacData.js
@@ -112,7 +112,7 @@ async function readMamacData(meter, conn) {
 			maxDate: meter.maxDate,
 			threshold: readingGap,
 			maxError: meter.maxError,
-			disableChecks: meter.disableChecks
+			disableChecks: disableChecks
 		},
 		conn = conn,
 		honorDst = false,
diff --git a/src/server/sql/meter/create_meters_table.sql b/src/server/sql/meter/create_meters_table.sql
index 30722dec3..14afff315 100644
--- a/src/server/sql/meter/create_meters_table.sql
+++ b/src/server/sql/meter/create_meters_table.sql
@@ -70,5 +70,5 @@ CREATE TABLE IF NOT EXISTS meters (
     min_date TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00+00:00',
     max_date TIMESTAMP NOT NULL DEFAULT '6970-01-01 00:00:00+00:00',
     max_error INTEGER NOT NULL DEFAULT 75,
-    disable_checks BOOLEAN DEFAULT false
+    disable_checks disable_checks_type NOT NULL DEFAULT 'reject_none'
 );
diff --git a/src/server/sql/unit/create_disable_checks_types_enum.sql b/src/server/sql/unit/create_disable_checks_types_enum.sql
new file mode 100644
index 000000000..34b0ed0f4
--- /dev/null
+++ b/src/server/sql/unit/create_disable_checks_types_enum.sql
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- This should avoid an error when the type already exists. This is an issue since
+-- OED install stops the creation of database items after this.
+DO $$ BEGIN 
+	CREATE TYPE disable_checks_type AS ENUM('reject_bad', 'reject_all', 'reject_none');
+EXCEPTION
+	WHEN duplicate_object THEN null;
+END $$;
diff --git a/src/server/sql/unit/create_units_table.sql b/src/server/sql/unit/create_units_table.sql
index 0c9e0a6ea..70e1af9bb 100644
--- a/src/server/sql/unit/create_units_table.sql
+++ b/src/server/sql/unit/create_units_table.sql
@@ -14,5 +14,6 @@ CREATE TABLE IF NOT EXISTS units (
 	preferred_display BOOLEAN NOT NULL,
 	note TEXT,
 	min_val FLOAT NOT NULL DEFAULT -9007199254740991 CHECK (min_val::FLOAT >= -9007199254740991),
-    max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val::FLOAT <= 9007199254740991)
+    max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val::FLOAT <= 9007199254740991),
+	disable_checks disable_checks_type NOT NULL DEFAULT 'reject_none'
 );
diff --git a/src/server/sql/unit/insert_new_unit.sql b/src/server/sql/unit/insert_new_unit.sql
index fa8cf8c6c..9ae495793 100644
--- a/src/server/sql/unit/insert_new_unit.sql
+++ b/src/server/sql/unit/insert_new_unit.sql
@@ -2,6 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-INSERT INTO units(name, identifier, unit_represent, sec_in_rate, type_of_unit, suffix, displayable, preferred_display, note, max_val, min_val)
-VALUES (${name}, ${identifier}, ${unitRepresent}, ${secInRate}, ${typeOfUnit}, ${suffix}, ${displayable}, ${preferredDisplay}, ${note}, ${maxVal}, ${minVal})
+INSERT INTO units(name, identifier, unit_represent, sec_in_rate, type_of_unit, suffix, displayable, preferred_display, note, max_val, min_val, disable_checks)
+VALUES (${name}, ${identifier}, ${unitRepresent}, ${secInRate}, ${typeOfUnit}, ${suffix}, ${displayable}, ${preferredDisplay}, ${note}, ${maxVal}, ${minVal}, ${disableChecks})
 RETURNING id;
diff --git a/src/server/sql/unit/update_unit.sql b/src/server/sql/unit/update_unit.sql
index b7a3bded4..6cf8e6c63 100644
--- a/src/server/sql/unit/update_unit.sql
+++ b/src/server/sql/unit/update_unit.sql
@@ -13,5 +13,6 @@ UPDATE units
 		preferred_display = ${preferredDisplay},
 		note = ${note},
 		max_val = ${maxVal},
-		min_val = ${minVal}
+		min_val = ${minVal},
+		disable_checks = ${disableChecks}
 	WHERE id = ${id};
diff --git a/src/server/util/insertData.js b/src/server/util/insertData.js
index af3186f58..5ee08636b 100644
--- a/src/server/util/insertData.js
+++ b/src/server/util/insertData.js
@@ -433,7 +433,7 @@ async function insertMeters(metersToInsert, conn) {
 					maxDate: meter.maxDate,
 					threshold: meter.readingGap,
 					maxError: meter.maxError,
-					disableChecks: meter.disableChecks
+					disableChecks: disableChecks
 				}
 				if (meterData.file) {
 					// load data from file