Home Information - Your home, your data, organized.
Python
Fixed some alert audio issues and some refinements.
Tony Cassandrae90ce7cc4ef6
diff --git a/Makefile b/Makefileindex 1e0841a0..b466eb02 100644--- a/Makefile+++ b/Makefile@@ -9,6 +9,11 @@ SCRIPTS = deploy/env-generate.py deploy/run_container.shtest:cd src && ./manage.py test --keepdb+lint:+ cd src && flake8 --config=.flake8-ci hi/ 2>/dev/null++check: test lint+docker-build: Dockerfile@HI_VERSION=$$(cat HI_VERSION); \docker build \diff --git a/docs/GettingStarted.md b/docs/GettingStarted.mdindex 6f674acc..9b3afcc5 100644--- a/docs/GettingStarted.md+++ b/docs/GettingStarted.md@@ -159,7 +159,7 @@ For those higher-level, attributes, you can add them to a location using the "In#### Sounds-For features that use sounds (e.g., alerts), this allows toggling to mute and unmute.+For features that use sounds (e.g., alerts), this allows toggling to mute and unmute. The alert sounds are considered "auto-play" by browsers, so you may need to allow this in the browser in order to hear the alert sounds. If you see "blocked' on this button, click it to see more info about fixing it.#### Sleepdiff --git a/src/hi/apps/alert/alert_manager.py b/src/hi/apps/alert/alert_manager.pyindex ad81f368..84d92518 100644--- a/src/hi/apps/alert/alert_manager.py+++ b/src/hi/apps/alert/alert_manager.py@@ -54,7 +54,7 @@ class AlertManager( Singleton, NotificationMixin, SecurityMixin ):# in the view. Also, we return it if it has changed, which include# it having become empty.- new_alert = self._alert_queue.get_most_important_alert(+ new_alert = self._alert_queue.get_most_important_unacknowledged_alert(since_datetime = last_alert_status_datetime,)logger.debug(f"π new_alert from queue: {new_alert}")@@ -62,7 +62,7 @@ class AlertManager( Singleton, NotificationMixin, SecurityMixin ):if new_alert:max_alert = new_alertelse:- max_alert = self._alert_queue.get_most_important_alert()+ max_alert = self._alert_queue.get_most_important_unacknowledged_alert()logger.debug(f"π max_alert from queue: {max_alert}")diff --git a/src/hi/apps/alert/alert_queue.py b/src/hi/apps/alert/alert_queue.pyindex 24a700bc..78a0f14a 100644--- a/src/hi/apps/alert/alert_queue.py+++ b/src/hi/apps/alert/alert_queue.py@@ -38,7 +38,7 @@ class AlertQueue:continueraise KeyError( f'Alert not found for {alert_id}' )- def get_most_important_alert( self, since_datetime : datetime = None ):+ def get_most_important_unacknowledged_alert( self, since_datetime : datetime = None ):"""Returns the active alert that has the highest priority and which wascreated since the "since_datetime" passed (if any). If there arediff --git a/src/hi/apps/alert/alert_status.py b/src/hi/apps/alert/alert_status.pyindex ddee735c..91ea6915 100644--- a/src/hi/apps/alert/alert_status.py+++ b/src/hi/apps/alert/alert_status.py@@ -32,24 +32,24 @@ class AlertStatusData:)response_dict = dict()- logger.debug(f"π΅ AlertStatusData.to_dict() - max_audio_signal: {self.max_audio_signal}")- logger.debug(f"π΅ AlertStatusData.to_dict() - new_audio_signal: {self.new_audio_signal}")- logger.debug(f"π΅ AlertStatusData.to_dict() - alert_list length: {len(self.alert_list) if self.alert_list else 0}")+ logger.debug(f"AlertStatusData.to_dict() - max_audio_signal: {self.max_audio_signal}")+ logger.debug(f"AlertStatusData.to_dict() - new_audio_signal: {self.new_audio_signal}")+ logger.debug(f"AlertStatusData.to_dict() - alert_list length: {len(self.alert_list) if self.alert_list else 0}")if self.max_audio_signal:response_dict[self.MaxAudioSignalNameAttr] = self.max_audio_signal.label- logger.debug(f"π Added max_audio_signal: {self.max_audio_signal.label}")+ logger.debug(f"Added max_audio_signal: {self.max_audio_signal.label}")else:- logger.debug("π No max_audio_signal to add")+ logger.debug("No max_audio_signal to add")if self.new_audio_signal:response_dict[self.NewAudioSignalNameAttr] = self.new_audio_signal.label- logger.debug(f"π΅ Added new_audio_signal: {self.new_audio_signal.label}")+ logger.debug(f"Added new_audio_signal: {self.new_audio_signal.label}")else:- logger.debug("π΅ No new_audio_signal to add")+ logger.debug("No new_audio_signal to add")if self.alert_list:response_dict[self.AlarmMessageHtmlAttr] = alert_list_html_str- logger.debug(f"π Final response_dict keys: {list(response_dict.keys())}")+ logger.debug(f"Final response_dict keys: {list(response_dict.keys())}")return response_dictdiff --git a/src/hi/apps/audio/templates/audio/modals/audio_permission_guidance.html b/src/hi/apps/audio/templates/audio/modals/audio_permission_guidance.htmlindex 26ceec24..7ac131f2 100644--- a/src/hi/apps/audio/templates/audio/modals/audio_permission_guidance.html+++ b/src/hi/apps/audio/templates/audio/modals/audio_permission_guidance.html@@ -1,4 +1,4 @@-{% extends "modals/action_3.html" %}+{% extends "modals/action_2_with_cancel.html" %}{% block modal_dialog_id %}audio-guidance-modal{% endblock %}@@ -67,19 +67,11 @@</div>{% endblock %}-{% block action_left %}-<button type="button"- class="btn btn-outline-secondary"- data-dismiss="modal">- Cancel-</button>-{% endblock %}-{% block action_center %}<button type="button"- class="btn btn-secondary"+ class="btn btn-secondary btn-lg"onclick="Hi.settings.disableAudio(); Hi.audio.updateAudioButtonState(); $(this).closest('.modal').modal('hide');">- Disable Sounds Instead+ Disable Sounds</button>{% endblock %}@@ -87,6 +79,6 @@<button type="button"class="btn btn-primary btn-lg"onclick="location.reload();">- I Fixed It - Reload Page+ I Fixed It</button>-{% endblock %}\ No newline at end of file+{% endblock %}diff --git a/src/hi/static/js/audio.js b/src/hi/static/js/audio.jsindex cc2467cd..71f9ae9d 100644--- a/src/hi/static/js/audio.js+++ b/src/hi/static/js/audio.js@@ -10,8 +10,11 @@startAudibleSignal: function( signalName ) {_startAudibleSignal( signalName );},- setMaxSignalName: function( signalName ) {- return _setMaxSignalName( signalName );+ setActiveSignalName: function( signalName ) {+ return _setActiveSignalName( signalName );+ },+ clearAudibleSignal: function() {+ _clearAudibleSignal();},// Audio control UI methods used by audio_control.html@@ -40,24 +43,13 @@const AudioPollingIntervalMs = 3 * 60 * 1000;let gAudioPollingTimer = null;- let gCurrentMaxSignalName = null;+ let gActiveSignalName = null;function startAudioPolling() {- if (Hi.DEBUG) { console.log('π΅ Starting audio polling system'); }-- if (typeof Hi.watchdog === 'undefined') {- if (Hi.DEBUG) { console.error('β Hi.watchdog not available - audio polling disabled'); }- return;- }-- if (Hi.DEBUG) { console.log(`π Adding audio watchdog (interval: ${AudioPollingIntervalMs}ms, start delay: ${AudioPollingStartDelayMs}ms)`); }-Hi.watchdog.add( AudioPollingWatchdogType,checkAudioStatus,AudioPollingIntervalMs );gAudioPollingTimer = setTimeout( checkAudioStatus, AudioPollingStartDelayMs );-- if (Hi.DEBUG) { console.log('β Audio polling system initialized'); }}function setAudioPollingTimer() {@@ -75,15 +67,12 @@function checkAudioStatus() {clearAudioPollingTimer();try {- if (Hi.DEBUG) { console.log(`π Audio polling check - current max signal: ${gCurrentMaxSignalName}`); }+ if (Hi.DEBUG) { console.log(`Audio polling check - current: ${gActiveSignalName}`); }Hi.watchdog.ok( AudioPollingWatchdogType );- if ( gCurrentMaxSignalName ) {- if ( Hi.DEBUG ) { console.log( `π Audio max signal found: ${gCurrentMaxSignalName}` ); }- _startAudibleSignal( gCurrentMaxSignalName );- } else {- if ( Hi.DEBUG ) { console.log( "π No audio signal to play" ); }+ if ( gActiveSignalName ) {+ _startAudibleSignal( gActiveSignalName );}} catch (e) {console.error( `Exception in audio polling: ${e} (line=${e.lineNumber})` );@@ -98,12 +87,16 @@let gAudibleSignalTimer = null;let gActiveAudibleSignalName = null;- function _setMaxSignalName( signalName ) {- if (Hi.DEBUG) { console.log(`π’ Setting max audio signal: ${signalName}`); }- gCurrentMaxSignalName = signalName;- if (Hi.DEBUG) { console.log(`π’ gCurrentMaxSignalName is now: ${gCurrentMaxSignalName}`); }+ function _setActiveSignalName( signalName ) {+ if (Hi.DEBUG) { console.log(`Setting active audio signal: ${signalName}`); }+ gActiveSignalName = signalName;return true;}++ function _clearAudibleSignal() {+ gActiveSignalName = null;+ endAudibleSignal();+ }function setAudibleSignalTimer( ) {clearAudibleSignalTimer();@@ -122,23 +115,22 @@}function _startAudibleSignal( signalName ) {- if ( Hi.DEBUG ) { console.log( `π΅ Starting audio signal = ${signalName}` ); }- if ( Hi.DEBUG ) { console.log( `π§ Audio enabled check: ${Hi.settings.isAudioEnabled()}` ); }+ if ( Hi.DEBUG ) { console.log( `Starting audio signal = ${signalName}` ); }try {stopAudio( );clearAudibleSignalTimer();if ( ! Hi.settings.isAudioEnabled() ) {- if ( Hi.DEBUG ) { console.log( `π Audio disabled, not playing signal: ${signalName}` ); }+ if ( Hi.DEBUG ) { console.log( `Audio disabled, not playing signal: ${signalName}` ); }return;}let id = getAudioElementId( signalName );- if ( Hi.DEBUG ) { console.log( `π Looking for audio element with ID: ${id}` ); }+ if ( Hi.DEBUG ) { console.log( `Looking for audio element with ID: ${id}` ); }let elem = document.getElementById(id);if ( ! elem ) {- if ( Hi.DEBUG ) { console.log( `β Missing audio tag for ${signalName}` ); }+ if ( Hi.DEBUG ) { console.log( `Missing audio tag for ${signalName}` ); }return;}- if ( Hi.DEBUG ) { console.log( `β Found audio element for ${signalName}` ); }+ if ( Hi.DEBUG ) { console.log( `Found audio element for ${signalName}` ); }// Check if audio file loaded successfullyif (elem.readyState === 0) {@@ -155,17 +147,17 @@elem.currentTime = 0;// Handle autoplay policy restrictionsconst playPromise = elem.play();- if ( Hi.DEBUG ) { console.log( `π΅ Attempting to play audio element: ${id}` ); }+ if ( Hi.DEBUG ) { console.log( `Attempting to play audio element: ${id}` ); }if (playPromise !== undefined) {playPromise.then(() => {// Audio playback started successfully- if ( Hi.DEBUG ) { console.log( `β Audio playback started successfully: ${signalName}` ); }+ if ( Hi.DEBUG ) { console.log( `Audio playback started successfully: ${signalName}` ); }gActiveAudibleSignalName = signalName;setAudibleSignalTimer();}).catch(error => {// Autoplay was preventedif (error.name === 'NotAllowedError') {- if ( Hi.DEBUG ) { console.log( `β Audio autoplay blocked for ${signalName}` ); }+ if ( Hi.DEBUG ) { console.log( `Audio autoplay blocked for ${signalName}` ); }_showPermissionGuidanceIfNeeded();} else {console.error( `Audio playback error for ${signalName}: ${error}` );diff --git a/src/hi/static/js/status.js b/src/hi/static/js/status.jsindex 3f20c086..e6b8bd7b 100644--- a/src/hi/static/js/status.js+++ b/src/hi/static/js/status.js@@ -3,14 +3,14 @@const HiStatus = {init: function() {- startServerPolling();+ startServerPolling();},};window.Hi.status = HiStatus;window.addEventListener('load', function() {- HiStatus.init();+ HiStatus.init();});/*@@ -48,238 +48,231 @@let gLastServerDate = null;function startServerPolling() {- Hi.watchdog.add( ServerPollingWatchdogType,- fetchServerResponse,- ServerPollingIntervalMs );- gServerPollingTimer = setTimeout( fetchServerResponse, ServerPollingStartDelayMs );+ Hi.watchdog.add( ServerPollingWatchdogType,+ fetchServerResponse,+ ServerPollingIntervalMs );+ gServerPollingTimer = setTimeout( fetchServerResponse, ServerPollingStartDelayMs );}function setServerPollingTimer() {- gServerPollingTimer = setTimeout( fetchServerResponse, ServerPollingIntervalMs );+ gServerPollingTimer = setTimeout( fetchServerResponse, ServerPollingIntervalMs );}function clearServerPollingTimer() {- if ( gServerPollingTimer ) {- clearTimeout( gServerPollingTimer );- gServerPollingTimer = null;- }+ if ( gServerPollingTimer ) {+ clearTimeout( gServerPollingTimer );+ gServerPollingTimer = null;+ }}function fetchServerResponse() {- if ( Hi.isEditMode ) {- if ( Hi.DEBUG && TRACE ) { console.log( "Skipping polling server. Edit mode active." ); }- Hi.watchdog.ok( ServerPollingWatchdogType );- clearServerPollingTimer();- setServerPollingTimer();- return;- }+ if ( Hi.isEditMode ) {+ if ( Hi.DEBUG && TRACE ) { console.log( "Skipping polling server. Edit mode active." ); }+ Hi.watchdog.ok( ServerPollingWatchdogType );+ clearServerPollingTimer();+ setServerPollingTimer();+ return;+ }- if ( Hi.DEBUG && TRACE ) { console.log( "Polling server..." ); }- clearServerPollingTimer();-- let url = ServerPollingUrl;- if ( gLastServerDate ) {+ if ( Hi.DEBUG && TRACE ) { console.log( "Polling server..." ); }+ clearServerPollingTimer();++ let url = ServerPollingUrl;+ if ( gLastServerDate ) {const lastTimestampString = encodeURIComponent( gLastServerDate.toISOString() );- url += `?${LastServerTimestampAttr}=${lastTimestampString}`;- }-- $.ajaxSuppressLoader = true;- $.ajax({- type: 'GET',- url: url,+ url += `?${LastServerTimestampAttr}=${lastTimestampString}`;+ }++ $.ajaxSuppressLoader = true;+ $.ajax({+ type: 'GET',+ url: url,- complete: function (jqXHR, textStatus) {- $.ajaxSuppressLoader = false;- },- success: function( data, status, xhr ) {- try {- Hi.watchdog.ok( ServerPollingWatchdogType );- clearServerErrorIfNeeded();- gLastServerPollSuccessTime = (new Date()).getTime();- handleServerResponse( data, status, xhr );-- } catch (e) {- console.error( `Exception parsing server response: ${e} (line=${e.lineNumber})` );- } finally {- setServerPollingTimer();- }+ complete: function (jqXHR, textStatus) {+ $.ajaxSuppressLoader = false;},- error: function (xhr, ajaxOptions, thrownError) {- try {- Hi.watchdog.ok( ServerPollingWatchdogType );- console.error( `Server polling error [${xhr.status}] : ${thrownError}` );- handlePollingError();+ success: function( data, status, xhr ) {+ try {+ Hi.watchdog.ok( ServerPollingWatchdogType );+ clearServerErrorIfNeeded();+ gLastServerPollSuccessTime = (new Date()).getTime();+ handleServerResponse( data, status, xhr );++ } catch (e) {+ console.error( `Exception parsing server response: ${e} (line=${e.lineNumber})` );+ } finally {+ setServerPollingTimer();+ }+ },+ error: function (xhr, ajaxOptions, thrownError) {+ try {+ Hi.watchdog.ok( ServerPollingWatchdogType );+ console.error( `Server polling error [${xhr.status}] : ${thrownError}` );+ handlePollingError();- } catch (e) {- console.error( `Exception handling polling error: ${e} (line=${e.lineNumber})` );- } finally {- setServerPollingTimer();- }- }- });+ } catch (e) {+ console.error( `Exception handling polling error: ${e} (line=${e.lineNumber})` );+ } finally {+ setServerPollingTimer();+ }+ }+ });}function handleServerResponse( respObj, textStatus, jqXHR ) {- if ( Hi.DEBUG && TRACE ) { console.log( "Server response: "+JSON.stringify( respObj)); }+ if ( Hi.DEBUG && TRACE ) { console.log( "Server response: "+JSON.stringify( respObj)); }- doServerStartTimeCheck( respObj );-- if ( ServerTimestampAttr in respObj ) {- gLastServerDate = new Date( respObj[ServerTimestampAttr] );- }- if ( AlertStatusDataAttr in respObj ) {- handleAlertStatusData( respObj[AlertStatusDataAttr] );- }- if ( IdReplaceUpdateMapAttr in respObj ) {- handleIdReplacements( respObj[IdReplaceUpdateMapAttr],- respObj[IdReplaceHashMapAttr] );- }- if ( CssClassUpdateMapAttr in respObj ) {- handleCssClassUpdates( respObj[CssClassUpdateMapAttr] );- }+ doServerStartTimeCheck( respObj );++ if ( ServerTimestampAttr in respObj ) {+ gLastServerDate = new Date( respObj[ServerTimestampAttr] );+ }+ if ( AlertStatusDataAttr in respObj ) {+ handleAlertStatusData( respObj[AlertStatusDataAttr] );+ }+ if ( IdReplaceUpdateMapAttr in respObj ) {+ handleIdReplacements( respObj[IdReplaceUpdateMapAttr],+ respObj[IdReplaceHashMapAttr] );+ }+ if ( CssClassUpdateMapAttr in respObj ) {+ handleCssClassUpdates( respObj[CssClassUpdateMapAttr] );+ }}function doServerStartTimeCheck( respObj ) {- if ( ServerStartTimestampAttr in respObj ) {- let startServerDate = new Date( respObj[ServerStartTimestampAttr] );- if ( gLastStartServerDate ) {- const timeDifference = Math.abs(startServerDate - gLastStartServerDate.getTime());- const tolerance = 60 * 1000; // milliseconds- if (timeDifference > tolerance) {- if ( Hi.DEBUG ) {- console.log( 'Server restart detected.'- + `Reloading page. ${gLastStartServerDate} -> ${startServerDate}` );- }- gLastStartServerDate = startServerDate;- location.reload(true);- }- } else {- gLastStartServerDate = startServerDate;- }- }+ if ( ServerStartTimestampAttr in respObj ) {+ let startServerDate = new Date( respObj[ServerStartTimestampAttr] );+ if ( gLastStartServerDate ) {+ const timeDifference = Math.abs(startServerDate - gLastStartServerDate.getTime());+ const tolerance = 60 * 1000; // milliseconds+ if (timeDifference > tolerance) {+ if ( Hi.DEBUG ) {+ console.log( 'Server restart detected.'+ + `Reloading page. ${gLastStartServerDate} -> ${startServerDate}` );+ }+ gLastStartServerDate = startServerDate;+ location.reload(true);+ }+ } else {+ gLastStartServerDate = startServerDate;+ }+ }}function handleAlertStatusData( alertStatusData ) {- if ( ! alertStatusData ) {- if ( Hi.DEBUG ) { console.log('π No alert status data received'); }- return;- }-- if ( Hi.DEBUG ) { console.log('π Alert status data:', alertStatusData); }-- if (( MaxAudioSignalNameAttr in alertStatusData )- && ( alertStatusData[MaxAudioSignalNameAttr] )) {- if ( Hi.DEBUG ) { console.log(`π Found max audio signal: ${alertStatusData[MaxAudioSignalNameAttr]}`); }- Hi.audio.setMaxSignalName( alertStatusData[MaxAudioSignalNameAttr] );- if ( Hi.DEBUG ) { console.log(`π setMaxSignalName completed for: ${alertStatusData[MaxAudioSignalNameAttr]}`); }- } else {- if ( Hi.DEBUG ) { console.log('π No max audio signal in alert data'); }- }-- if (( NewAudioSignalNameAttr in alertStatusData )- && ( alertStatusData[NewAudioSignalNameAttr] )) {- if ( Hi.DEBUG ) { console.log(`π΅ Found new audio signal: ${alertStatusData[NewAudioSignalNameAttr]}`); }- Hi.audio.startAudibleSignal( alertStatusData[NewAudioSignalNameAttr] );- } else {- if ( Hi.DEBUG ) { console.log('π΅ No new audio signal in alert data'); }- }+ if ( Hi.DEBUG ) { console.log('Alert Status Data: ', JSON.stringify(alertStatusData) ); }++ if ( ! alertStatusData ) {+ Hi.audio.clearAudibleSignal();+ return;+ }++ if (( MaxAudioSignalNameAttr in alertStatusData )+ && ( alertStatusData[MaxAudioSignalNameAttr] )) {+ Hi.audio.setActiveSignalName( alertStatusData[MaxAudioSignalNameAttr] );+ }++ if (( NewAudioSignalNameAttr in alertStatusData )+ && ( alertStatusData[NewAudioSignalNameAttr] )) {+ Hi.audio.startAudibleSignal( alertStatusData[NewAudioSignalNameAttr] );+ }- if (( AlarmMessageHtmlAttr in alertStatusData )- && alertStatusData[AlarmMessageHtmlAttr] ) {- $(AlertBannerContentSelector).html( alertStatusData[AlarmMessageHtmlAttr] );- $(AlertBannerContainerSelector).show();- } else {- $(AlertBannerContainerSelector).hide();- $(AlertBannerContentSelector).empty();- }+ if (( AlarmMessageHtmlAttr in alertStatusData )+ && alertStatusData[AlarmMessageHtmlAttr] ) {+ $(AlertBannerContentSelector).html( alertStatusData[AlarmMessageHtmlAttr] );+ $(AlertBannerContainerSelector).show();+ } else {+ $(AlertBannerContainerSelector).hide();+ $(AlertBannerContentSelector).empty();+ }}function handleIdReplacements( replaceMap, hashMap ) {- for ( let html_id in replaceMap ) {- let replacementContent = replaceMap[html_id];- let contentHash = hashMap[html_id];+ for ( let html_id in replaceMap ) {+ let replacementContent = replaceMap[html_id];+ let contentHash = hashMap[html_id];- const elem = $(`#${html_id}`);- if ( $(elem).attr( 'hi-id-replace-hash' ) != contentHash ) {- $(elem).replaceWith( replacementContent );- $(`#${html_id}`).attr( 'hi-id-replace-hash', contentHash );- }- }+ const elem = $(`#${html_id}`);+ if ( $(elem).attr( 'hi-id-replace-hash' ) != contentHash ) {+ $(elem).replaceWith( replacementContent );+ $(`#${html_id}`).attr( 'hi-id-replace-hash', contentHash );+ }+ }}function handleCssClassUpdates( updateMap ) {- for ( let cssClass in updateMap ) {- let elements = getElementsByCssClass( cssClass );- let attrMap = updateMap[cssClass];- for ( let attrName in attrMap ) {- let attrValue = attrMap[attrName];- elements.each( function() {- if (this.hasAttribute(attrName)) {- let currentValue = $(this).attr(attrName);- if ( attrValue && ( currentValue !== String(attrValue) )) {- $(this).attr( attrName, attrValue );- }- } else {- // Special cases:- // - descendent SELECT tag - assume select value is sensor value- // - descendent checkbox - assumes status value 'on' when checked- // - descendent DIV tag with status attr - assume attr and text needs updating- //- if ( attrName == 'status' ) {- $(this).find('select').val( attrValue );-- $(this).find('input[type="checkbox"]').each( function(index, element) {- if ( attrValue == 'on' ) {- $(element).attr( 'checked', 'true' );- } else {- $(element).removeAttr( 'checked' );- }- });-- $(this).find('div[status]').each( function(index, element) {- $(element).attr( attrName, attrValue );- $(element).text( attrValue );- });- }- }- });- }- }+ for ( let cssClass in updateMap ) {+ let elements = getElementsByCssClass( cssClass );+ let attrMap = updateMap[cssClass];+ for ( let attrName in attrMap ) {+ let attrValue = attrMap[attrName];+ elements.each( function() {+ if (this.hasAttribute(attrName)) {+ let currentValue = $(this).attr(attrName);+ if ( attrValue && ( currentValue !== String(attrValue) )) {+ $(this).attr( attrName, attrValue );+ }+ } else {+ // Special cases:+ // - descendent SELECT tag - assume select value is sensor value+ // - descendent checkbox - assumes status value 'on' when checked+ // - descendent DIV tag with status attr - assume attr and text needs updating+ //+ if ( attrName == 'status' ) {+ $(this).find('select').val( attrValue );++ $(this).find('input[type="checkbox"]').each( function(index, element) {+ if ( attrValue == 'on' ) {+ $(element).attr( 'checked', 'true' );+ } else {+ $(element).removeAttr( 'checked' );+ }+ });++ $(this).find('div[status]').each( function(index, element) {+ $(element).attr( attrName, attrValue );+ $(element).text( attrValue );+ });+ }+ }+ });+ }+ }}function getElementsByCssClass( cssClass ) {- let elements = $(`.${cssClass}`);- return elements;+ let elements = $(`.${cssClass}`);+ return elements;}function handlePollingError() {- var nowTime = (new Date()).getTime();- var elapsedMs = nowTime - gLastServerPollSuccessTime;- if ( Hi.DEBUG ) { console.log( `Polling error elapsedMs=${elapsedMs}` ); }-- if ( elapsedMs >= PollingErrorNotifyTimeMs ) {- notifyServerError();- }+ var nowTime = (new Date()).getTime();+ var elapsedMs = nowTime - gLastServerPollSuccessTime;+ if ( Hi.DEBUG ) { console.log( `Polling error elapsedMs=${elapsedMs}` ); }++ if ( elapsedMs >= PollingErrorNotifyTimeMs ) {+ notifyServerError();+ }}function notifyServerError() {- if ( gIsServerErrorShowing ) {- return;- }- $(ServerErrorMessageSelector).show();- gIsServerErrorShowing = true;- Hi.audio.startAudibleSignal( Hi.audio.WARNING_SIGNAL_NAME );+ if ( gIsServerErrorShowing ) {+ return;+ }+ $(ServerErrorMessageSelector).show();+ gIsServerErrorShowing = true;+ Hi.audio.startAudibleSignal( Hi.audio.WARNING_SIGNAL_NAME );}function clearServerErrorIfNeeded() {- if ( ! gIsServerErrorShowing ) {- return;- }- $(ServerErrorMessageSelector).hide();- gIsServerErrorShowing = false;- Hi.audio.startAudibleSignal( Hi.audio.INFO_SIGNAL_NAME );+ if ( ! gIsServerErrorShowing ) {+ return;+ }+ $(ServerErrorMessageSelector).hide();+ gIsServerErrorShowing = false;+ Hi.audio.startAudibleSignal( Hi.audio.INFO_SIGNAL_NAME );}})();diff --git a/src/hi/templates/modals/action_2_with_cancel.html b/src/hi/templates/modals/action_2_with_cancel.htmlnew file mode 100644index 00000000..41845443--- /dev/null+++ b/src/hi/templates/modals/action_2_with_cancel.html@@ -0,0 +1,6 @@+{% extends "modals/action_3.html" %}++{% block action_left %}+<a id="hi-modal-cancel" role="button" {% if autofocus %}autofocus="autofocus"{% endif %}+ class="btn btn-lg btn-tertiary" href="#" data-dismiss="modal">CANCEL</a>+{% endblock %}