|
98 | 98 | if (data.status === 1) { |
99 | 99 | color = '#53B30C'; |
100 | 100 | selector = 'fa-check-circle'; |
| 101 | + } else if (data.status === 2) { |
| 102 | + color = '#5bc0de'; |
| 103 | + selector = 'fa-circle-o-notch fa-spin' |
101 | 104 | } |
102 | 105 |
|
103 | 106 | $('#applyUpdate').removeClass('fa-circle-o-notch fa-spinner fa-spin fa-check-circle fa-times-circle').addClass(selector).css({ color: color }); |
104 | 107 | }); |
105 | 108 |
|
106 | 109 | // Socket Recieves New Status from Scales |
107 | 110 | socket.on('status', function(data) { |
108 | | - if(data.status !== 'crashed') { |
109 | | -
|
110 | | - var newStatus, selector = 'fa-times-circle'; |
111 | | - var color = '#E33200'; |
112 | | -
|
113 | | - switch (data.status) { |
114 | | - case 0: |
115 | | - newStatus = 'OFF'; |
116 | | - break; |
117 | | - case 1: |
118 | | - newStatus = 'ON'; |
119 | | - color = "#53B30C"; |
120 | | - selector = "fa-check-circle"; |
121 | | - break; |
122 | | - case 2: |
123 | | - newStatus = 'STARTING'; |
124 | | - break; |
125 | | - case 3: |
126 | | - newStatus = 'STOPPING'; |
127 | | - break; |
128 | | - } |
129 | | -
|
130 | | - $('#applyUpdate').removeClass('fa-circle-o-notch fa-spinner fa-spin fa-check-circle fa-times-circle').addClass(selector).css({ color: color }); |
| 111 | + var newStatus, selector = 'fa-times-circle'; |
| 112 | + var color = '#E33200'; |
131 | 113 |
|
132 | | - $.notify({ |
133 | | - message: '{{ trans('server.ajax.socket_status') }} <strong>' + newStatus + '</strong>.' |
134 | | - }, { |
135 | | - type: 'info' |
136 | | - }); |
| 114 | + switch (data.status) { |
| 115 | + case 0: |
| 116 | + newStatus = 'OFF'; |
| 117 | + break; |
| 118 | + case 1: |
| 119 | + newStatus = 'ON'; |
| 120 | + color = "#53B30C"; |
| 121 | + selector = "fa-check-circle"; |
| 122 | + break; |
| 123 | + case 2: |
| 124 | + newStatus = 'STARTING'; |
| 125 | + color = '#5bc0de'; |
| 126 | + selector = 'fa-circle-o-notch fa-spin' |
| 127 | + break; |
| 128 | + case 3: |
| 129 | + newStatus = 'STOPPING'; |
| 130 | + break; |
| 131 | + } |
137 | 132 |
|
138 | | - } else { |
| 133 | + $('#applyUpdate').removeClass('fa-circle-o-notch fa-spinner fa-spin fa-check-circle fa-times-circle').addClass(selector).css({ color: color }); |
139 | 134 |
|
140 | | - $.notify({ |
141 | | - message: '{{ trans('server.ajax.socket_status_crashed') }}' |
142 | | - }, { |
143 | | - delay: 5000, |
144 | | - type: 'danger' |
145 | | - }); |
146 | | - } |
| 135 | + $.notify({ |
| 136 | + message: '{{ trans('server.ajax.socket_status') }} <strong>' + newStatus + '</strong>.' |
| 137 | + }, { |
| 138 | + type: 'info' |
| 139 | + }); |
| 140 | + }); |
147 | 141 |
|
| 142 | + socket.on('crashed', function () { |
| 143 | + $.notify({ |
| 144 | + message: '{{ trans('server.ajax.socket_status_crashed') }}' |
| 145 | + }, { |
| 146 | + delay: 5000, |
| 147 | + type: 'danger' |
| 148 | + }); |
148 | 149 | }); |
149 | 150 |
|
150 | 151 | }); |
|
0 commit comments