Skip to content

Commit 7c3c372

Browse files
kiznichekizniche
committed
fix TOC?, remove references to math controllers
1 parent 9ce0c36 commit 7c3c372

File tree

5 files changed

+3
-84
lines changed

5 files changed

+3
-84
lines changed

‎README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Mycodo is open source software for the Raspberry Pi that couples inputs and outp
1212
.. contents:: Table of Contents
1313
:depth: 1
1414

15+
1516
Quick Install
1617
-------------
1718

‎mycodo/widgets/widget_gauge_angular.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,6 @@ def generate_page_variables(widget_unique_id, widget_options):
303303
getLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'input', '{{measurement_id}}', {{widget_options['max_measure_age']}});
304304
repeatLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'input', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['max_measure_age']}});
305305
{%- endfor -%}
306-
307-
{% for each_math in math if each_math.unique_id == device_id %}
308-
getLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'math', '{{measurement_id}}', {{widget_options['max_measure_age']}});
309-
repeatLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'math', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['max_measure_age']}});
310-
{%- endfor -%}
311306
312307
{% for each_function in function if each_function.unique_id == device_id %}
313308
getLastDataGaugeAngular('{{each_widget.unique_id}}', '{{device_id}}', 'function', '{{measurement_id}}', {{widget_options['max_measure_age']}});
@@ -401,10 +396,6 @@ def generate_page_variables(widget_unique_id, widget_options):
401396
{%- endif -%}
402397
{%- endif -%}
403398
{%- endfor -%}
404-
405-
{%- for each_math in math if each_math.unique_id == device_id -%}
406-
{{each_math.measure|safe}}
407-
{%- endfor -%}
408399
409400
{%- for each_function in function if each_function.unique_id == device_id -%}
410401
{{each_function.measure|safe}}
@@ -435,10 +426,6 @@ def generate_page_variables(widget_unique_id, widget_options):
435426
{%- for each_input in input if each_input.unique_id == device_id -%}
436427
{{' ' + dict_units[device_measurements_dict[measurement_id].unit]['unit']}}
437428
{%- endfor -%}
438-
439-
{%- for each_math in math if each_math.unique_id == device_id -%}
440-
{{' ' + each_math.measure_units|safe}}
441-
{%- endfor -%}
442429
443430
{%- for each_function in function if each_function.unique_id == device_id -%}
444431
{{' ' + each_function.measure_units|safe}}

‎mycodo/widgets/widget_gauge_solid.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,6 @@ def generate_page_variables(widget_unique_id, widget_options):
315315
getLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'input', '{{measurement_id}}', {{widget_options['max_measure_age']}});
316316
repeatLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'input', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['max_measure_age']}});
317317
{%- endfor -%}
318-
319-
{% for each_math in math if each_math.unique_id == device_id %}
320-
getLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'math', '{{measurement_id}}', {{widget_options['max_measure_age']}});
321-
repeatLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'math', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['max_measure_age']}});
322-
{%- endfor -%}
323318
324319
{% for each_function in function if each_function.unique_id == device_id %}
325320
getLastDataGaugeSolid('{{each_widget.unique_id}}', '{{device_id}}', 'function', '{{measurement_id}}', {{widget_options['max_measure_age']}});
@@ -408,16 +403,6 @@ def generate_page_variables(widget_unique_id, widget_options):
408403
{{', ' + dict_measurements[device_measurements_dict[measurement_id].measurement]['name']}}
409404
{%- endif -%}
410405
{%- endfor -%}
411-
412-
{%- for each_math in math if each_math.unique_id == device_id and measurement_id in device_measurements_dict -%}
413-
{{each_math.name}} (
414-
{%- if not device_measurements_dict[measurement_id].single_channel -%}
415-
{{'CH' + (device_measurements_dict[measurement_id].channel|int)|string}}
416-
{%- endif -%}
417-
{%- if device_measurements_dict[measurement_id].measurement -%}
418-
{{', ' + dict_measurements[device_measurements_dict[measurement_id].measurement]['name']}}
419-
{%- endif -%}
420-
{%- endfor -%}
421406
422407
{%- for each_function in function if each_function.unique_id == device_id and measurement_id in device_measurements_dict -%}
423408
{{each_function.name}} (
@@ -451,12 +436,6 @@ def generate_page_variables(widget_unique_id, widget_options):
451436
return this.series.name + ':<b> ' + Highcharts.numberFormat(this.y, 2) + ' {{dict_units[device_measurements_dict[measurement_id].unit]['unit']}}</b><br>';
452437
},
453438
{%- endfor -%}
454-
455-
{%- for each_math in math if each_math.unique_id == device_id %}
456-
pointFormatter: function () {
457-
return this.series.name + '</span>:<b> ' + Highcharts.numberFormat(this.y, 2) + ' {{dict_units[device_measurements_dict[measurement_id].unit]['unit']}}</b><br>';
458-
},
459-
{%- endfor -%}
460439
461440
{%- for each_function in function if each_function.unique_id == device_id %}
462441
pointFormatter: function () {
@@ -469,10 +448,6 @@ def generate_page_variables(widget_unique_id, widget_options):
469448
{{' ' + dict_units[device_measurements_dict[measurement_id].unit]['unit']}}
470449
{%- endfor -%}
471450
472-
{%- for each_math in math if each_math.unique_id == device_id -%}
473-
{{' ' + dict_units[device_measurements_dict[measurement_id].unit]['unit']}}
474-
{%- endfor -%}
475-
476451
{%- for each_function in function if each_function.unique_id == device_id -%}
477452
{{' ' + dict_units[device_measurements_dict[measurement_id].unit]['unit']}}
478453
{%- endfor -%}

‎mycodo/widgets/widget_indicator.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,6 @@
197197
repeatLastDataIndicator('{{each_widget.unique_id}}', '{{each_input.unique_id}}', 'input', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{each_widget.decimal_places}}, {{widget_options['option_invert']|int}});
198198
{%- endfor -%}
199199
200-
{% for each_math in math if each_math.unique_id == device_id %}
201-
getLastDataIndicator('{{each_widget.unique_id}}', '{{each_math.unique_id}}', 'math', '{{measurement_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}}, {{widget_options['option_invert']|int}});
202-
repeatLastDataIndicator('{{each_widget.unique_id}}', '{{each_math.unique_id}}', 'math', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{each_widget.decimal_places}}, {{widget_options['option_invert']|int}});
203-
{%- endfor -%}
204-
205200
{% for each_output in output if each_output.unique_id == device_id %}
206201
getLastDataIndicator('{{each_widget.unique_id}}', '{{each_output.unique_id}}', 'output', '{{channel_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}}, {{widget_options['option_invert']|int}});
207202
repeatLastDataIndicator('{{each_widget.unique_id}}', '{{each_output.unique_id}}', 'output', '{{channel_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{each_widget.decimal_places}}, {{widget_options['option_invert']|int}});

‎mycodo/widgets/widget_measurement.py

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142

143143
'widget_dashboard_head': """<!-- No head content -->""",
144144

145-
'widget_dashboard_title_bar': """<span style="padding-right: 0.5em; font-size: {{each_widget.font_em_name}}em">{{each_widget.name}}</span>""",
145+
'widget_dashboard_title_bar': """<span class="widget-title-bar" style="padding-right: 0.5em; font-size: {{each_widget.font_em_name}}em">{{each_widget.name}}</span>""",
146146

147147
'widget_dashboard_body': """
148148
{%- set device_id = widget_options['measurement'].split(",")[0] -%}
@@ -152,7 +152,7 @@
152152
153153
{%- for each_input in input if each_input.unique_id == device_id and measurement_id in device_measurements_dict -%}
154154
155-
<span style="font-size: {{widget_options['font_em_value']}}em" id="value-{{each_widget.unique_id}}"></span><span style="font-size: {{widget_options['font_em_unit']}}em">
155+
<span class="widget-measurement-value" style="font-size: {{widget_options['font_em_value']}}em" id="value-{{each_widget.unique_id}}"></span><span class="widget-measurement-unit" style="font-size: {{widget_options['font_em_unit']}}em">
156156
{%- if dict_measure_units[measurement_id] in dict_units and
157157
dict_units[dict_measure_units[measurement_id]]['unit'] and
158158
widget_options['enable_unit'] -%}
@@ -183,40 +183,6 @@
183183
{{')'}}
184184
{%- endif -%}
185185
{%- endfor -%}
186-
187-
{%- for each_math in math if each_math.unique_id == device_id and measurement_id in device_measurements_dict -%}
188-
189-
<span style="font-size: {{widget_options['font_em_value']}}em" id="value-{{each_widget.unique_id}}"></span><span style="font-size: {{widget_options['font_em_unit']}}em">
190-
{%- if dict_measure_units[measurement_id] in dict_units and
191-
dict_units[dict_measure_units[measurement_id]]['unit'] and
192-
widget_options['enable_unit'] -%}
193-
{{' ' + dict_units[dict_measure_units[measurement_id]]['unit']}}
194-
{%- endif -%}
195-
</span>
196-
197-
{%- if widget_options['enable_name'] or widget_options['enable_channel'] or widget_options['enable_measurement'] -%}
198-
<br/><span style="font-size: {{widget_options['font_em_timestamp']}}em">
199-
{%- endif -%}
200-
201-
{%- if widget_options['enable_name'] -%}
202-
{{each_math.name + ' '}}
203-
{%- endif -%}
204-
{%- if widget_options['enable_channel'] or widget_options['enable_measurement'] -%}
205-
{{'('}}
206-
{%- endif -%}
207-
{%- if not device_measurements_dict[measurement_id].single_channel and widget_options['enable_channel'] -%}
208-
{{'CH' + (device_measurements_dict[measurement_id].channel|int)|string}}
209-
{%- endif -%}
210-
{%- if widget_options['enable_channel'] and widget_options['enable_measurement'] -%}
211-
{{', '}}
212-
{%- endif -%}
213-
{%- if widget_options['enable_measurement'] and device_measurements_dict[measurement_id].measurement -%}
214-
{{dict_measurements[device_measurements_dict[measurement_id].measurement]['name']}}
215-
{%- endif -%}
216-
{%- if widget_options['enable_channel'] or widget_options['enable_measurement'] -%}
217-
{{')'}}
218-
{%- endif -%}
219-
{%- endfor -%}
220186
221187
{%- for each_function in function if each_function.unique_id == device_id and measurement_id in device_measurements_dict -%}
222188
@@ -413,11 +379,6 @@
413379
getLastDataMeasurement('{{each_widget.unique_id}}', '{{each_input.unique_id}}', 'input', '{{measurement_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});
414380
repeatLastDataMeasurement('{{each_widget.unique_id}}', '{{each_input.unique_id}}', 'input', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});
415381
{%- endfor -%}
416-
417-
{% for each_math in math if each_math.unique_id == device_id %}
418-
getLastDataMeasurement('{{each_widget.unique_id}}', '{{each_math.unique_id}}', 'math', '{{measurement_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});
419-
repeatLastDataMeasurement('{{each_widget.unique_id}}', '{{each_math.unique_id}}', 'math', '{{measurement_id}}', {{widget_options['refresh_seconds']}}, {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});
420-
{%- endfor -%}
421382
422383
{% for each_function in function if each_function.unique_id == device_id %}
423384
getLastDataMeasurement('{{each_widget.unique_id}}', '{{each_function.unique_id}}', 'function', '{{measurement_id}}', {{widget_options['measurement_max_age']}}, {{widget_options['decimal_places']}});

0 commit comments

Comments
 (0)