Sync notification working, need to be tested
diff --git a/views/ngXosViews/synchronizerNotifier/src/css/main.css b/views/ngXosViews/synchronizerNotifier/src/css/main.css
index b95bde2..88a08e7 100644
--- a/views/ngXosViews/synchronizerNotifier/src/css/main.css
+++ b/views/ngXosViews/synchronizerNotifier/src/css/main.css
@@ -3,7 +3,8 @@
#xosSynchronizerNotifier .alert {
margin-bottom: 0px !important; }
#xosSynchronizerNotifier .sync-status-container {
- position: relative; }
+ position: relative;
+ z-index: 200; }
#xosSynchronizerNotifier .notification-panel {
position: absolute;
width: 200px; }
diff --git a/views/ngXosViews/synchronizerNotifier/src/index.html b/views/ngXosViews/synchronizerNotifier/src/index.html
index d8bc502..cb9b7b5 100644
--- a/views/ngXosViews/synchronizerNotifier/src/index.html
+++ b/views/ngXosViews/synchronizerNotifier/src/index.html
@@ -26,6 +26,7 @@
<script src="vendor/Chart.js/Chart.js"></script>
<script src="vendor/angular-chart.js/dist/angular-chart.js"></script>
<script src="vendor/d3/d3.js"></script>
+<script src="vendor/angular-recursion/angular-recursion.js"></script>
<!-- endbower -->
<!-- endjs -->
<!-- inject:js -->
diff --git a/views/ngXosViews/synchronizerNotifier/src/js/main.js b/views/ngXosViews/synchronizerNotifier/src/js/main.js
index 301345c..03c10be 100644
--- a/views/ngXosViews/synchronizerNotifier/src/js/main.js
+++ b/views/ngXosViews/synchronizerNotifier/src/js/main.js
@@ -79,7 +79,7 @@
this.sendEvents(diags);
});
}
- }, 10000);
+ }, 6 * 1000);
})
.directive('syncStatus', function() {
return {
@@ -88,31 +88,31 @@
bindToController: true,
controllerAs: 'vm',
templateUrl: 'templates/sync-status.tpl.html',
- controller: function($log, $rootScope, Diag, xosNotification){
+ controller: function($log, $rootScope, Diag, xosNotification, XosUserPrefs){
Diag.start();
this.showNotificationPanel = true;
this.synchronizers = {};
- const notified = {};
-
this.showNoSync = true;
$rootScope.$on('diag', (e, d) => {
this.synchronizers[d.name] = d;
+
// if errored
if(!d.status){
+ console.log(d.name, XosUserPrefs.getSynchronizerNotificationStatus(d.name));
// and not already notified
- if(!notified[d.name]){
- xosNotification.notify('CORD Synchronizer Error', {
- icon: '/xos/core/static/cord-logo.png',
- body: `The ${d.name} synchronizer has stopped.`
+ if(!XosUserPrefs.getSynchronizerNotificationStatus(d.name)){
+ xosNotification.notify('CORD Synchronizer', {
+ icon: '/static/cord-logo.png',
+ body: `The ${d.name} synchronizer has not performed actions in the last 15 minutes.`
});
}
- notified[d.name] = true;
+ XosUserPrefs.setSynchronizerNotificationStatus(d.name, true);
}
else {
- notified[d.name] = false;
+ XosUserPrefs.setSynchronizerNotificationStatus(d.name, false);
}
// hide list if empty
diff --git a/views/ngXosViews/synchronizerNotifier/src/sass/main.scss b/views/ngXosViews/synchronizerNotifier/src/sass/main.scss
index 273131a..d101d76 100644
--- a/views/ngXosViews/synchronizerNotifier/src/sass/main.scss
+++ b/views/ngXosViews/synchronizerNotifier/src/sass/main.scss
@@ -10,6 +10,7 @@
.sync-status-container {
position: relative;
+ z-index: 200;
}
.notification-panel {