Skip to content

Commit

Permalink
Optie om datumtijd uit telegram te negeren #1233
Browse files Browse the repository at this point in the history
  • Loading branch information
dennissiemensma committed Jan 10, 2021
1 parent b983344 commit 762ecc0
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 5 deletions.
1 change: 1 addition & 0 deletions dsmr_datalogger/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

@admin.register(DataloggerSettings)
class DataloggerSettingsAdmin(SingletonModelAdmin):
change_form_template = 'dsmr_datalogger/datalogger_settings/change_form.html'
readonly_fields = ('restart_required',)
fieldsets = (
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='dataloggersettings',
name='process_sleep',
field=models.DecimalField(decimal_places=1, default=5.0, help_text='The number of seconds the application will sleep after reading data from the datalogger (API excluded).', max_digits=3, validators=[django.core.validators.MinValueValidator(0.5), django.core.validators.MaxValueValidator(99)], verbose_name='Datalogger process sleep'),
field=models.DecimalField(decimal_places=1, default=5.0, help_text='The number of seconds the application will sleep after reading data from the datalogger (API and remote datalogger excluded). The recommended value is 5 seconds or higher and does not affect daily totals!', max_digits=3, validators=[django.core.validators.MinValueValidator(0.5), django.core.validators.MaxValueValidator(99)], verbose_name='Datalogger process sleep'),
),
migrations.RunPython(migrate_forward, migrate_backward),
]
Expand Down
3 changes: 2 additions & 1 deletion dsmr_datalogger/models/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ class DataloggerSettings(ModelUpdateMixin, SingletonModel):
validators=[MinValueValidator(0.5), MaxValueValidator(99)],
verbose_name=_('Datalogger process sleep'),
help_text=_(
'The number of seconds the application will sleep after reading data from the datalogger (API excluded).'
'The number of seconds the application will sleep after reading data from the datalogger (API and remote '
'datalogger excluded). The recommended value is 5 seconds or higher and does not affect daily totals!'
)
)
restart_required = models.BooleanField(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% extends 'admin/change_form.html' %}
{% load i18n %}


{% block field_sets %}
<div class="submit-row" style="text-align: left; background: #FFFFCC;">
<ul>
<li>{% blocktranslate %}Please note that lowering the "Datalogger process sleep" setting will result in more disk activity and more data being stored, possibly degrading performance.{% endblocktranslate %}</li>
<li>{% blocktranslate %}Do not enable "Override telegram timestamp" unless your smart meter wrongly emits telegrams with an offset of multiple minutes or more.{% endblocktranslate %}</li>
</ul>
</div>

{{ block.super }}

{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="submit-row" style="text-align: left; background: #FFFFCC;">
{% blocktranslate %}Data retention policies cleans up source data after a while.{% endblocktranslate %}
{% blocktranslate %}The following data is never discarded:{% endblocktranslate %}
<ul class="">
<ul>
<li>{% blocktranslate %}Day totals/statistics (as displayed in Archive).{% endblocktranslate %}</li>
<li>{% blocktranslate %}Hour totals/statistics (as displayed in Archive).{% endblocktranslate %}</li>
<li>{% blocktranslate %}The first source reading of each hour.{% endblocktranslate %}</li>
Expand Down
Binary file modified dsmrreader/locales/nl/LC_MESSAGES/django.mo
Binary file not shown.
10 changes: 8 additions & 2 deletions dsmrreader/locales/nl/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,8 @@ msgstr "Voor uitlezen via een netwerk socket: Poort van het netwerkapparaat verb
msgid "Datalogger process sleep"
msgstr "Datalogger proces sleep"

msgid "The number of seconds the application will sleep after reading data from the datalogger (API excluded)."
msgstr "Het aantal seconden dat de applicatie wacht na het inlezen van gegevens via de datalogger (API uitgezonderd)."
msgid "The number of seconds the application will sleep after reading data from the datalogger (API and remote datalogger excluded). The recommended value is 5 seconds or higher and does not affect daily totals!"
msgstr "Het aantal seconden dat de applicatie wacht na het inlezen van gegevens via de datalogger (API en remote datalogger uitgezonderd). De aanbevolen waarde is 5 seconden of hoger en heeft geen invloed op de dagtotalen!"

msgid "Whether the datalogger process requires a restart. It should occur automatically."
msgstr "Geeft aan of het datalogger-proces een herstart vereist. Dit zou automatisch moeten gaan."
Expand Down Expand Up @@ -753,6 +753,12 @@ msgstr "Meterstatistieken wijziging"
msgid "DSMR Meter statistics changes"
msgstr "Meterstatistieken wijzigingen"

msgid "Please note that lowering the \"Datalogger process sleep\" setting will result in more disk activity and more data being stored, possibly degrading performance."
msgstr "N.B.: Het verlagen van \"Datalogger proces sleep\" zorgt voor meer schijfactiviteit en schrijft meer gegevens weg, met een mogelijk negatieve impact op de performance."

msgid "Do not enable \"Override telegram timestamp\" unless your smart meter wrongly emits telegrams with an offset of multiple minutes or more."
msgstr "Schakel \"Overschrijf tijdstip van telegrammen\" niet in, tenzij je slimme meter verkeerde telegrammen stuurt die meer dan enkele minuten afwijken."

msgid "Data retention policies cleans up source data after a while."
msgstr "Dataretentiebeleid schoont na verloop van tijd brondata op."

Expand Down

0 comments on commit 762ecc0

Please sign in to comment.