From 1e66a0676fd6ffd39012b2b9fdc310c17385cf45 Mon Sep 17 00:00:00 2001
From: Tatu Wikman <tatu.wikman@gmail.com>
Date: Thu, 23 Apr 2026 16:22:46 +0300
Subject: [PATCH] Fix startrails moonmode settings, fixes #2832

The toggle is inverted and the fields should actually be disabled when
the toggle is off.

Added a "inverted" parameter for the fields and made the texts a bit
clearer
---
 indi_allsky/flask/forms.py              |  2 +-
 indi_allsky/flask/templates/config.html | 27 +++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/indi_allsky/flask/forms.py b/indi_allsky/flask/forms.py
index c4df76e52..6df6027e5 100644
--- a/indi_allsky/flask/forms.py
+++ b/indi_allsky/flask/forms.py
@@ -4470,7 +4470,7 @@ class IndiAllskyConfigForm(FlaskForm):
     REALTIME_KEOGRAM__SAVE_INTERVAL  = IntegerField('Save Interval', validators=[REALTIME_KEOGRAM__SAVE_INTERVAL_validator])
     REALTIME_KEOGRAM__LABEL          = BooleanField('Label Realtime Keogram')
     STARTRAILS_SUN_ALT_THOLD         = FloatField('Star Trails Max Sun Altitude', validators=[DataRequired(), STARTRAILS_SUN_ALT_THOLD_validator])
-    STARTRAILS_MOONMODE_THOLD        = BooleanField('Star Trails Custom Moon Mode')
+    STARTRAILS_MOONMODE_THOLD        = BooleanField('Star Trails: Use Camera Moon Mode Thresholds')
     STARTRAILS_MOON_ALT_THOLD        = FloatField('Custom Max Moon Altitude', validators=[DataRequired(), STARTRAILS_MOON_ALT_THOLD_validator])
     STARTRAILS_MOON_PHASE_THOLD      = FloatField('Custom Max Moon Phase', validators=[DataRequired(), STARTRAILS_MOON_PHASE_THOLD_validator])
     STARTRAILS_MAX_ADU               = IntegerField('Star Trails Max ADU', validators=[DataRequired(), STARTRAILS_MAX_ADU_validator])
diff --git a/indi_allsky/flask/templates/config.html b/indi_allsky/flask/templates/config.html
index 435056242..26fc38f06 100644
--- a/indi_allsky/flask/templates/config.html
+++ b/indi_allsky/flask/templates/config.html
@@ -4404,7 +4404,7 @@ <h2 class="accordion-header">
                 <div id="STARTRAILS_MOONMODE_THOLD-error" class="invalid-feedback text-danger" style="display: none;"></div>
             </div>
         </div>
-        <div class="col-sm-8">Exclude images during moonmode</div>
+        <div class="col-sm-8">When enabled, use the camera moon mode thresholds to exclude images. When disabled, use the custom thresholds below.</div>
     </div>
 
     <div class="form-group row">
@@ -4415,7 +4415,7 @@ <h2 class="accordion-header">
             {{ form_config.STARTRAILS_MOON_ALT_THOLD(class='form-control bg-secondary') }}
             <div id="STARTRAILS_MOON_ALT_THOLD-error" class="invalid-feedback text-danger" style="display: none;"></div>
         </div>
-        <div class="col-sm-8">Custom moon altitude threshold (91 is disabled)</div>
+        <div class="col-sm-8">Exclude images when moon altitude exceeds this value in degrees. Both altitude and phase must be exceeded to exclude (AND logic). 91 disables the check (moon can never reach 91°). A reasonable starting point is 30°.</div>
     </div>
 
     <div class="form-group row">
@@ -4426,7 +4426,7 @@ <h2 class="accordion-header">
             {{ form_config.STARTRAILS_MOON_PHASE_THOLD(class='form-control bg-secondary') }}
             <div id="STARTRAILS_MOON_PHASE_THOLD-error" class="invalid-feedback text-danger" style="display: none;"></div>
         </div>
-        <div class="col-sm-8">Custom moon phase threshold (101 is disabled)</div>
+        <div class="col-sm-8">Exclude images when moon phase exceeds this percentage. Both altitude and phase must be exceeded to exclude (AND logic). 101 disables the check (moon phase can never exceed 100%). A reasonable starting point is 50%.</div>
     </div>
 
     <div class="form-group row">
@@ -10683,10 +10683,12 @@ <h2 class="accordion-header">
     );
 }
 
-function group_on_change(trigger_checkbox_field, group_fields, group_checkbox_fields) {
+function group_on_change(trigger_checkbox_field, group_fields, group_checkbox_fields, inverted=false) {
     $('#' + trigger_checkbox_field).on('change', function() {
-        // logic is reversed
-        if (!$('#' + trigger_checkbox_field).prop('checked')) {
+        var checked = $('#' + trigger_checkbox_field).prop('checked');
+        var enable = inverted ? !checked : checked;
+
+        if (!enable) {
             group_fields.forEach(item => {
                 $('#' + item).attr({'readonly': true, 'disabled': true});
                 $('#' + item).addClass('bg-dark text-secondary');
@@ -10709,8 +10711,11 @@ <h2 class="accordion-header">
 }
 
 
-function group_on_ready(trigger_checkbox_field, group_fields, group_checkbox_fields) {
-    if (!$('#' + trigger_checkbox_field).prop('checked')) {
+function group_on_ready(trigger_checkbox_field, group_fields, group_checkbox_fields, inverted=false) {
+    var checked = $('#' + trigger_checkbox_field).prop('checked');
+    var enable = inverted ? !checked : checked;
+
+    if (!enable) {
         group_fields.forEach(item => {
             $('#' + item).attr({'readonly': true, 'disabled': true});
             $('#' + item).addClass('bg-dark text-secondary');
@@ -10818,8 +10823,8 @@ <h2 class="accordion-header">
     'STARTRAILS_MOON_PHASE_THOLD',
 ];
 
-// startrails moonmode
-group_on_change('STARTRAILS_MOONMODE_THOLD', group_fields_st_moonmode, []);
+// startrails moonmode - custom thresholds are used when moon mode exclusion is OFF
+group_on_change('STARTRAILS_MOONMODE_THOLD', group_fields_st_moonmode, [], true);
 
 
 // nonlocal assets
@@ -11279,7 +11284,7 @@ <h2 class="accordion-header">
 
 
     // startrails moonmode
-    group_on_ready('STARTRAILS_MOONMODE_THOLD', group_fields_st_moonmode, []);
+    group_on_ready('STARTRAILS_MOONMODE_THOLD', group_fields_st_moonmode, [], true);
 
 
     // nonlocal assets