Merge pull request #445 from Neriderc/dev

Resolve issue with JPG quality setting

Author: Neriderc

resources/javascript/MainPage/SettingsGroup.js

@@ -5,7 +5,6 @@ export class SettingsGroup {
     }
 
     linkModifierElement(modifierId, value, customCondition) {
-        let el = document.getElementById(modifierId);
         let element = document.querySelector('#' + modifierId);
         element.addEventListener('change', () => {this.runEventListener(modifierId, value, customCondition)});
     }

resources/javascript/gvexport.js

@@ -662,6 +662,9 @@ function loadSettings(data, isNamedSetting = false) {
                 el.value = settings[key];
             }
         }
+
+        // Update show/hide of JPG quality option
+        Form.showHideMatchDropdown('output_type', 'server_pdf_subgroup', 'pdf|svg|jpg')
     });
     Form.showHideMatchCheckbox('mark_not_related', 'mark_related_subgroup');
     Form.showHideMatchCheckbox('show_birthdate', 'birth_date_subgroup');

resources/views/page.phtml

@@ -408,7 +408,7 @@ $usegraphviz = $vars['graphviz_bin'] != "";
         new module.SettingsGroup('subgroup_border_custom', 'border_col_type', '<?= Settings::OPTION_BORDER_CUSTOM_COLOUR;?>');
         new module.SettingsGroup('subgroup_border_vitals', 'border_col_type', '<?= Settings::OPTION_BORDER_VITAL_COLOUR;?>');
         new module.SettingsGroup('subgroup_border_age', 'border_col_type', '<?= Settings::OPTION_BORDER_AGE_COLOUR;?>');
-        new module.SettingsGroup('server_pdf_subgroup', 'output_type', 'pdf|svg', () => {return graphvizAvailable});
+        new module.SettingsGroup('server_pdf_subgroup', 'output_type', 'pdf|svg|jpg', () => {return graphvizAvailable});
         new module.SettingsGroup('subgroup_stripe_vitals', 'stripe_col_type', '<?= Settings::OPTION_STRIPE_VITAL_COLOUR;?>');
         new module.SettingsGroup('subgroup_stripe_age', 'stripe_col_type', '<?= Settings::OPTION_STRIPE_AGE_COLOUR;?>');
     })