Add default disable checks

src/client/app/actions/admin.ts

@@ -85,6 +85,10 @@ export function updateDefaultMeterMaximumErrors(defaultMeterMaximumErrors: numbe
 	return { type: ActionType.UpdateDefaultMeterMaximumErrors, defaultMeterMaximumErrors };
 }
 
+export function updateDefaultMeterDisableChecks(defaultMeterDisableChecks: boolean): t.UpdateDefaultMeterDisableChecksAction {
+	return { type: ActionType.UpdateDefaultMeterDisableChecks, defaultMeterDisableChecks };
+}
+
 function requestPreferences(): t.RequestPreferencesAction {
 	return { type: ActionType.RequestPreferences };
 }
@@ -187,7 +191,8 @@ export function submitPreferences() {
 				defaultMeterMinimumDate: state.admin.defaultMeterMinimumDate,
 				defaultMeterMaximumDate: state.admin.defaultMeterMaximumDate,
 				defaultMeterReadingGap: state.admin.defaultMeterReadingGap,
-				defaultMeterMaximumErrors: state.admin.defaultMeterMaximumErrors
+				defaultMeterMaximumErrors: state.admin.defaultMeterMaximumErrors,
+				defaultMeterDisableChecks: state.admin.defaultMeterDisableChecks
 			});
 			// Only return the defaultMeterReadingFrequency because the value from the DB
 			// generally differs from what the user input so update state with DB value.

src/client/app/components/admin/PreferencesComponent.tsx

@@ -21,7 +21,8 @@ import {
 	UpdateDefaultMeterMinimumDateAction,
 	UpdateDefaultMeterMaximumDateAction,
 	UpdateDefaultMeterReadingGapAction,
-	UpdateDefaultMeterMaximumErrorsAction
+	UpdateDefaultMeterMaximumErrorsAction,
+	UpdateDefaultMeterDisableChecksAction
 
 } from '../../types/redux/admin';
 import { removeUnsavedChanges, updateUnsavedChanges } from '../../actions/unsavedWarning';
@@ -31,6 +32,8 @@ import TimeZoneSelect from '../TimeZoneSelect';
 import store from '../../index';
 import { fetchPreferencesIfNeeded, submitPreferences } from '../../actions/admin';
 import { AreaUnitType } from '../../utils/getAreaUnitConversion';
+import translate from '../../utils/translate';
+import { TrueFalseType } from '../../types/items';
 
 interface PreferencesProps {
 	displayTitle: string;
@@ -50,6 +53,7 @@ interface PreferencesProps {
 	defaultMeterMaximumDate: string;
 	defaultMeterReadingGap: number;
 	defaultMeterMaximumErrors: number;
+	defaultMeterDisableChecks: boolean;
 	updateDisplayTitle(title: string): UpdateDisplayTitleAction;
 	updateDefaultChartType(defaultChartToRender: ChartTypes): UpdateDefaultChartToRenderAction;
 	toggleDefaultBarStacking(): ToggleDefaultBarStackingAction;
@@ -67,10 +71,12 @@ interface PreferencesProps {
 	updateDefaultMeterMaximumDate(defaultMeterMaximumDate: string): UpdateDefaultMeterMaximumDateAction;
 	updateDefaultMeterReadingGap(defaultMeterReadingGap: number): UpdateDefaultMeterReadingGapAction;
 	updateDefaultMeterMaximumErrors(defaultMeterMaximumErrors: number): UpdateDefaultMeterMaximumErrorsAction;
+	updateDefaultMeterDisableChecks(defaultMeterDisableChecks: boolean): UpdateDefaultMeterDisableChecksAction;
 }
 
 type PreferencesPropsWithIntl = PreferencesProps & WrappedComponentProps;
 
+// TODO: Add warning for invalid data
 class PreferencesComponent extends React.Component<PreferencesPropsWithIntl> {
 	constructor(props: PreferencesPropsWithIntl) {
 		super(props);
@@ -91,6 +97,7 @@ class PreferencesComponent extends React.Component<PreferencesPropsWithIntl> {
 		this.handleDefaultMeterMaximumDateChange = this.handleDefaultMeterMaximumDateChange.bind(this);
 		this.handleDefaultMeterReadingGapChange = this.handleDefaultMeterReadingGapChange.bind(this);
 		this.handleDefaultMeterMaximumErrorsChange = this.handleDefaultMeterMaximumErrorsChange.bind(this);
+		this.handleDefaultMeterDisableChecksChange = this.handleDefaultMeterDisableChecksChange.bind(this);
 	}
 
 	public render() {
@@ -385,6 +392,19 @@ class PreferencesComponent extends React.Component<PreferencesPropsWithIntl> {
 						maxLength={50}
 					/>
 				</div>
+				<div style={bottomPaddingStyle}>
+					<p style={titleStyle}>
+						<FormattedMessage id='default.meter.disable.checks' />:
+					</p>
+					<Input
+						type='select'
+						value={this.props.defaultMeterDisableChecks?.toString()}
+						onChange={this.handleDefaultMeterDisableChecksChange}>
+						{Object.keys(TrueFalseType).map(key => {
+							return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>)
+						})}
+					</Input>
+				</div>
 				<Button
 					type='submit'
 					onClick={this.handleSubmitPreferences}
@@ -501,6 +521,11 @@ class PreferencesComponent extends React.Component<PreferencesPropsWithIntl> {
 		this.updateUnsavedChanges();
 	}
 
+	private handleDefaultMeterDisableChecksChange(e: { target: HTMLInputElement; }) {
+		this.props.updateDefaultMeterDisableChecks(JSON.parse(e.target.value))
+		this.updateUnsavedChanges();
+	}
+
 }
 
 export default injectIntl(PreferencesComponent);

src/client/app/components/meters/CreateMeterModalComponent.tsx

@@ -81,7 +81,7 @@ export default function CreateMeterModalComponent(props: CreateMeterModalCompone
 		minDate: adminState.defaultMeterMinimumDate,
 		maxDate: adminState.defaultMeterMaximumDate,
 		maxError: adminState.defaultMeterMaximumErrors,
-		disableChecks: false
+		disableChecks: adminState.defaultMeterDisableChecks
 	}
 
 	const dropdownsStateDefaults = {
@@ -869,7 +869,7 @@ export default function CreateMeterModalComponent(props: CreateMeterModalCompone
 								id='disableChecks'
 								name='disableChecks'
 								type='select'
-								defaultValue={state.disableChecks.toString()}
+								defaultValue={state.disableChecks?.toString()}
 								onChange={e => handleBooleanChange(e)}>
 								{Object.keys(TrueFalseType).map(key => {
 									return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>)

src/client/app/containers/admin/PreferencesContainer.ts

@@ -21,7 +21,8 @@ import {
 	updateDefaultMeterMinimumDate,
 	updateDefaultMeterMaximumDate,
 	updateDefaultMeterReadingGap,
-	updateDefaultMeterMaximumErrors
+	updateDefaultMeterMaximumErrors,
+	updateDefaultMeterDisableChecks
 } from '../../actions/admin';
 import { State } from '../../types/redux/state';
 import { Dispatch } from '../../types/redux/actions';
@@ -47,7 +48,8 @@ function mapStateToProps(state: State) {
 		defaultMeterMinimumDate: state.admin.defaultMeterMinimumDate,
 		defaultMeterMaximumDate: state.admin.defaultMeterMaximumDate,
 		defaultMeterReadingGap: state.admin.defaultMeterReadingGap,
-		defaultMeterMaximumErrors: state.admin.defaultMeterMaximumErrors
+		defaultMeterMaximumErrors: state.admin.defaultMeterMaximumErrors,
+		defaultMeterDisableChecks: state.admin.defaultMeterDisableChecks
 	};
 }
 
@@ -69,8 +71,9 @@ function mapDispatchToProps(dispatch: Dispatch) {
 		updateDefaultMeterMaximumValue: (defaultMeterMaximumValue: number) => dispatch(updateDefaultMeterMaximumValue(defaultMeterMaximumValue)),
 		updateDefaultMeterMinimumDate: (defaultMeterMinimumDate: string) => dispatch(updateDefaultMeterMinimumDate(defaultMeterMinimumDate)),
 		updateDefaultMeterMaximumDate: (defaultMeterMaximumDate: string) => dispatch(updateDefaultMeterMaximumDate(defaultMeterMaximumDate)),
+		updateDefaultMeterReadingGap: (defaultMeterReadingGap: number) => dispatch(updateDefaultMeterReadingGap(defaultMeterReadingGap)),
 		updateDefaultMeterMaximumErrors: (defaultMeterMaximumErrors: number) => dispatch(updateDefaultMeterMaximumErrors(defaultMeterMaximumErrors)),
-		updateDefaultMeterReadingGap: (defaultMeterReadingGap: number) => dispatch(updateDefaultMeterReadingGap(defaultMeterReadingGap))
+		updateDefaultMeterDisableChecks: (defaultMeterDisableChecks: boolean) => dispatch(updateDefaultMeterDisableChecks(defaultMeterDisableChecks))
 	};
 }
 

src/client/app/reducers/admin.ts

@@ -30,7 +30,8 @@ const defaultState: AdminState = {
 	defaultMeterMinimumDate: moment(0).utc().format('YYYY-MM-DD HH:mm:ssZ'),
 	defaultMeterMaximumDate: moment(0).utc().add(5000, 'years').format('YYYY-MM-DD HH:mm:ssZ'),
 	defaultMeterReadingGap: 0,
-	defaultMeterMaximumErrors: 75
+	defaultMeterMaximumErrors: 75,
+	defaultMeterDisableChecks: false
 };
 
 export default function admin(state = defaultState, action: AdminAction) {
@@ -106,7 +107,8 @@ export default function admin(state = defaultState, action: AdminAction) {
 				defaultMeterMinimumDate: action.data.defaultMeterMinimumDate,
 				defaultMeterMaximumDate: action.data.defaultMeterMaximumDate,
 				defaultMeterReadingGap: action.data.defaultMeterReadingGap,
-				defaultMeterMaximumErrors: action.data.defaultMeterMaximumErrors
+				defaultMeterMaximumErrors: action.data.defaultMeterMaximumErrors,
+				defaultMeterDisableChecks: action.data.defaultMeterDisableChecks
 			};
 		case ActionType.MarkPreferencesNotSubmitted:
 			return {
@@ -179,6 +181,12 @@ export default function admin(state = defaultState, action: AdminAction) {
 				defaultMeterMaximumErrors: action.defaultMeterMaximumErrors,
 				submitted: false
 			}
+		case ActionType.UpdateDefaultMeterDisableChecks:
+			return {
+				...state,
+				defaultMeterDisableChecks: action.defaultMeterDisableChecks,
+				submitted: false
+			}
 		default:
 			return state;
 	}

src/client/app/translations/data.js

@@ -127,8 +127,9 @@ const localeData = {
 		"default.meter.maximum.value": "Default meter maximum reading value check",
 		"default.meter.minimum.date": "Default meter minimum reading date check",
 		"default.meter.maximum.date": "Default meter maximum reading date check",
+		"default.meter.reading.gap": "Default meter reading gap",
 		"default.meter.maximum.errors": "Default maximum number of errors in meter reading",
-		"default.meter.reading.gap": "Default meter reading gap", 
+		"default.meter.disable.checks": "Default meter disable checks", 
 		"delete.group": "Delete Group",
 		"delete.map": "Delete Map",
 		"delete.user": "Delete User",
@@ -597,7 +598,8 @@ const localeData = {
 		"default.meter.minimum.date": "(Need French) Default meter minimum reading date check",	
 		"default.meter.maximum.date": "(Need French) Default meter maximum reading date check",	
 		"default.meter.maximum.errors": "(Need French) Default maximum number of errors in meter reading",	
-		"default.meter.reading.gap": "(Need French) Default meter reading gap", 
+		"default.meter.reading.gap": "(Need French) Default meter reading gap",
+		"default.meter.disable.checks": "(Need French) Default meter disable checks", 
 		"delete.group": "Supprimer le Groupe",
 		"delete.map": "Supprimer la carte",
 		"delete.user": "Supprimer l'utilisateur",
@@ -1066,7 +1068,8 @@ const localeData = {
 		"default.meter.minimum.date": "(Need Spanish) Default meter minimum reading date check",
 		"default.meter.maximum.date": "(Need Spanish) Default meter maximum reading date check",
 		"default.meter.maximum.errors": "(Need Spanish) Default maximum number of errors in meter reading",
-		"default.meter.reading.gap": "(Need Spanish) Default meter reading gap", 
+		"default.meter.reading.gap": "(Need Spanish) Default meter reading gap",
+		"default.meter.disable.checks": "(Need Spanish) Default meter disable checks",  
 		"delete.group": "Eliminar grupo",
 		"delete.map": "Borrar mapa",
 		"delete.user": "Borrar usario",

src/client/app/types/items.ts

@@ -53,6 +53,7 @@ export interface PreferenceRequestItem {
 	defaultMeterMaximumDate: string;
 	defaultMeterReadingGap: number;
 	defaultMeterMaximumErrors: number;
+	defaultMeterDisableChecks: boolean;
 }
 
 /**

src/client/app/types/redux/actions.ts

@@ -90,6 +90,7 @@ export enum ActionType {
 	UpdateDefaultMeterMaximumDate = 'UPDATE_DEFAULT_METER_MAXIMUM_DATE',
 	UpdateDefaultMeterReadingGap = 'UPDATE_DEFAULT_METER_READING_GAP',
 	UpdateDefaultMeterMaximumErrors = 'UPDATE_DEFAULT_METER_MAXIMUM_ERRORS',
+	UpdateDefaultMeterDisableChecks = 'UPDATE_DEFAULT_METER_DISABLE_CHECKS',
 
 	UpdateSelectedLanguage = 'UPDATE_SELECTED_LANGUAGE',
 

src/client/app/types/redux/admin.ts

@@ -30,7 +30,8 @@ export type AdminAction =
 	| UpdateDefaultMeterMinimumDateAction
 	| UpdateDefaultMeterMaximumDateAction
 	| UpdateDefaultMeterReadingGapAction
-	| UpdateDefaultMeterMaximumErrorsAction;
+	| UpdateDefaultMeterMaximumErrorsAction
+	| UpdateDefaultMeterDisableChecksAction;
 
 export interface UpdateImportMeterAction {
 	type: ActionType.UpdateImportMeter;
@@ -138,6 +139,11 @@ export interface UpdateDefaultMeterMaximumErrorsAction {
 	defaultMeterMaximumErrors: number;
 }
 
+export interface UpdateDefaultMeterDisableChecksAction {
+	type: ActionType.UpdateDefaultMeterDisableChecks;
+	defaultMeterDisableChecks: boolean;
+}
+
 export interface AdminState {
 	selectedMeter: number | null;
 	displayTitle: string;
@@ -159,4 +165,5 @@ export interface AdminState {
 	defaultMeterMaximumDate: string;
 	defaultMeterReadingGap: number;
 	defaultMeterMaximumErrors: number;
+	defaultMeterDisableChecks: boolean;
 }

src/server/models/Preferences.js

@@ -25,11 +25,12 @@ class Preferences {
 	 * @param {String} defaultMeterMaximumValue - Option to set the default meter maximum value
 	 * @param {Number} defaultMeterReadingGap - Option to set the default meter reading gap
 	 * @param {Number} defaultMeterMaximumErrors - Option to set the default meter maximum number of errors
+	 * @param {Boolean} defaultMeterDisableChecks - Option to set the default meter disable checks
 	*/
 	constructor(displayTitle, defaultChartToRender, defaultBarStacking, defaultLanguage, defaultTimezone,
 		defaultWarningFileSize, defaultFileSizeLimit, defaultAreaNormalization, defaultAreaUnit, defaultMeterReadingFrequency, 
 		defaultMeterMinimumValue, defaultMeterMaximumValue, defaultMeterMinimumDate, 
-		defaultMeterMaximumDate, defaultMeterReadingGap, defaultMeterMaximumErrors) {
+		defaultMeterMaximumDate, defaultMeterReadingGap, defaultMeterMaximumErrors, defaultMeterDisableChecks) {
 		this.displayTitle = displayTitle;
 		this.defaultChartToRender = defaultChartToRender;
 		this.defaultBarStacking = defaultBarStacking;
@@ -46,6 +47,7 @@ class Preferences {
 		this.defaultMeterMaximumDate = defaultMeterMaximumDate;
 		this.defaultMeterReadingGap = defaultMeterReadingGap;
 		this.defaultMeterMaximumErrors = defaultMeterMaximumErrors;
+		this.defaultMeterDisableChecks = defaultMeterDisableChecks;
 	}
 
 	/**
@@ -83,7 +85,8 @@ class Preferences {
 			row.default_meter_minimum_date,
 			row.default_meter_maximum_date,
 			row.default_meter_reading_gap,
-			row.default_meter_maximum_errors
+			row.default_meter_maximum_errors,
+			row.default_meter_disable_checks
 		);
 	}
 
@@ -121,7 +124,8 @@ class Preferences {
 				defaultMeterMinimumDate: preferences.defaultMeterMinimumDate,
 				defaultMeterMaximumDate: preferences.defaultMeterMaximumDate,
 				defaultMeterReadingGap: preferences.defaultMeterReadingGap,
-				defaultMeterMaximumErrors: preferences.defaultMeterMaximumErrors
+				defaultMeterMaximumErrors: preferences.defaultMeterMaximumErrors,
+				defaultMeterDisableChecks: preferences.defaultMeterDisableChecks
 			});
 		// Postgres interprets the defaultMeterReadingFrequency and it might not be what was
 		// input so return the new preferences. Easier just to return them all and only

src/server/routes/preferences.js

@@ -84,6 +84,9 @@ router.post('/', async (req, res) => {
 				},
 				defaultMeterMaximumErrors: {
 					type: 'number'
+				},
+				defaultMeterDisableChecks: {
+					type: 'boolean'
 				}
 			}
 		}

src/server/services/csvPipeline/uploadReadings.js

@@ -74,7 +74,7 @@ async function uploadReadings(req, res, filepath, conn) {
 					preferences.defaultMeterMinimumDate, // minDate
 					preferences.defaultMeterMaximumDate, // maxDate
 					preferences.defaultMeterMaximumErrors, // maxError
-					undefined  // disableChecks
+					preferences.defaultMeterDisableChecks // disableChecks
 				)
 				await tempMeter.insert(conn);
 				meterCreated = true;

src/server/services/obvius/loadLogfileToReadings.js

@@ -60,7 +60,7 @@ async function loadLogfileToReadings(serialNumber, ipAddress, logfile, conn) {
 				preferences.defaultMeterMinimumDate, // minDate
 				preferences.defaultMeterMaximumDate, // maxDate
 				preferences.defaultMeterMaximumErrors, // maxError
-				undefined  // disableChecks
+				preferences.defaultMeterDisableChecks  // disableChecks
 			);
 			await meter.insert(conn);
 			log.warn('WARNING: Created a meter (' + `${serialNumber}.${i}` +

src/server/services/readMamacMeters.js

@@ -103,7 +103,7 @@ async function getMeterInfo(url, ip, csvLine) {
 				preferences.defaultMeterMinimumDate, // minDate
 				preferences.defaultMeterMaximumDate, // maxDate
 				preferences.defaultMeterMaximumErrors, // maxError
-				undefined  // disableChecks
+				preferences.defaultMeterDisableChecks  // disableChecks
 			);
 		});
 }

src/server/sql/preferences/create_preferences_table.sql

@@ -20,5 +20,6 @@ CREATE TABLE IF NOT EXISTS preferences (
 	default_meter_minimum_date TIMESTAMP NOT NULL,
     default_meter_maximum_date TIMESTAMP NOT NULL,
 	default_meter_reading_gap REAL NOT NULL,
-    default_meter_maximum_errors INTEGER NOT NULL
+    default_meter_maximum_errors INTEGER NOT NULL,
+	default_meter_disable_checks BOOLEAN NOT NULL
 );

src/server/sql/preferences/insert_default_row.sql

@@ -17,9 +17,9 @@ IF NOT EXISTS(SELECT *
 	default_language, default_timezone, default_warning_file_size, default_file_size_limit,
 	default_area_normalization, default_area_unit, default_meter_reading_frequency, 
 	default_meter_minimum_value, default_meter_maximum_value, default_meter_minimum_date, 
-	default_meter_maximum_date, default_meter_reading_gap, default_meter_maximum_errors) 
+	default_meter_maximum_date, default_meter_reading_gap, default_meter_maximum_errors, default_meter_disable_checks) 
 	VALUES ('', 'line', FALSE, 'en', NULL, 5, 25, FALSE, 'meters', '00:15:00', 
-	-9007199254740991, 9007199254740991, '1970-01-01 00:00:00+00:00', '6970-01-01 00:00:00+00:00', 0, 75);
+	-9007199254740991, 9007199254740991, '1970-01-01 00:00:00+00:00', '6970-01-01 00:00:00+00:00', 0, 75, FALSE);
     END IF ;
 
 END;

src/server/sql/preferences/update_preferences.sql

@@ -19,5 +19,6 @@ SET
 	default_meter_minimum_date = ${defaultMeterMinimumDate},
 	default_meter_maximum_date = ${defaultMeterMaximumDate},
 	default_meter_reading_gap = ${defaultMeterReadingGap},
-	default_meter_maximum_errors = ${defaultMeterMaximumErrors}
+	default_meter_maximum_errors = ${defaultMeterMaximumErrors},
+	default_meter_disable_checks = ${defaultMeterDisableChecks}
 ;