Edit ANOVA to show install button instead of force-insert install codes

minjk-bl · minjk-bl · commit cc09c3f30883 · 2023-08-30T13:21:05.000+09:00
diff --git a/visualpython/html/m_stats/anova.html b/visualpython/html/m_stats/anova.html
@@ -50,8 +50,8 @@
                 <div class="vp-st-option one-way two-way vp-grid-col-130">
                     <label for="sigLevel" class="vp-orange-text">Significance level</label>
                     <input type="number" id="sigLevel" class="vp-state vp-input" required/>
-                    <label for="covariate" class="vp-orange-text">Post hoc analysis</label>
-                    <div class="vp-grid-col-rp3">
+                    <label for="tukeyHSD" class="vp-orange-text">Post hoc analysis</label>
+                    <div class="vp-grid-col-rp3 vp-st-posthoc-box">
                         <label><input type="checkbox" id="tukeyHSD" class="vp-state" checked><span>Tukey HSD</span></label>
                         <label><input type="checkbox" id="tukey" class="vp-state"><span>Tukey</span></label>
                         <span></span>
diff --git a/visualpython/js/m_stats/Anova.js b/visualpython/js/m_stats/Anova.js
@@ -60,6 +60,8 @@ define([
 
             this.columnBindList = ['depVar', 'factor', 'factorA', 'factorB', 'covariate'];
 
+            this.tmpInstallCode = []; // install codes
+
             this.subsetEditor = {};
         }
 
@@ -74,6 +76,29 @@ define([
 
                 $(that.wrapSelector('.vp-st-option')).hide();
                 $(that.wrapSelector('.vp-st-option.' + testType)).show();
+
+                that.tmpInstallCode = [];
+                that.hideInstallButton();
+
+                if (testType === 'one-way' || testType === 'two-way') {
+                    if (that.state.tukey || that.state.scheffe || that.state.duncan) {
+                        // Add installation code
+                        if (vpConfig.extensionType === 'lite') {
+                            that.tmpInstallCode = ["%pip install scikit-posthocs"];
+                        } else {
+                            that.tmpInstallCode = ["!pip install scikit-posthocs"];
+                        }
+                        that.showInstallButton();
+                    }
+                } else if (testType === 'ancova') {
+                    // Add installation code : # pip install pingouin
+                    if (vpConfig.extensionType === 'lite') {
+                        that.tmpInstallCode = ["%pip install pingouin"];
+                    } else {
+                        that.tmpInstallCode = ["!pip install pingouin"];
+                    }
+                    that.showInstallButton();
+                }
             });
 
             $(this.wrapSelector('#data')).on('change', function() {
@@ -91,6 +116,28 @@ define([
                     com_generator.vp_bindColumnSource(that, 'data', that.columnBindList, 'select', false, false);
                 }
             });
+
+            $(this.wrapSelector('.vp-st-posthoc-box .vp-state')).on('change', function() {
+                let id = $(this)[0].id;
+                let checked = $(this).prop('checked') === true;
+                that.state[id] = checked;
+                let { testType, tukey, scheffe, duncan } = that.state;
+                if (testType === 'one-way' || testType === 'two-way') {
+                    if (tukey || scheffe || duncan) {
+                        // Add installation code
+                        if (vpConfig.extensionType === 'lite') {
+                            that.tmpInstallCode = ["%pip install scikit-posthocs"];
+                        } else {
+                            that.tmpInstallCode = ["!pip install scikit-posthocs"];
+                        }
+                        that.showInstallButton();
+                    } else {
+                        that.hideInstallButton();
+                    }
+                }
+            });
+
+            $(this.wrapSelector(''))
         }
 
         templateForBody() {
@@ -147,6 +194,10 @@ define([
             $(this.wrapSelector('.vp-st-option.' + this.state.testType)).show();
         }
 
+        generateInstallCode() {
+            return this.tmpInstallCode;
+        }
+
         generateCode() {
             let { 
                 testType, data, depVar, factor, factorA, factorB, covariate, sigLevel,
@@ -253,12 +304,6 @@ define([
                     }
 
                     if (tukey === true || scheffe === true || duncan === true) {
-                        if (vpConfig.extensionType === 'lite') {
-                            codeList.push("%pip install scikit-posthocs");
-                        } else {
-                            codeList.push("!pip install scikit-posthocs");
-                        }
-
                         // Post hoc analysis - Tukey
                         if (tukey === true) {
                             code.appendLine();
@@ -383,13 +428,6 @@ define([
                         code.append("display(_res[0])");
                     }
                     if (tukey === true || scheffe === true || duncan === true) {
-                        // Add installation code
-                        if (vpConfig.extensionType === 'lite') {
-                            codeList.push("%pip install scikit-posthocs");
-                        } else {
-                            codeList.push("!pip install scikit-posthocs");
-                        }
-
                         // Post hoc analysis - Tukey
                         if (tukey === true) {
                             code.appendLine();
@@ -453,13 +491,6 @@ define([
                         code.append("    plt.show()");
                     }
 
-                    // Add installation code : # pip install pingouin
-                    if (vpConfig.extensionType === 'lite') {
-                        codeList.push("%pip install pingouin");
-                    } else {
-                        codeList.push("!pip install pingouin");
-                    }
-
                     code.appendLine();
                     code.appendLine();
                     code.appendLine("# ANCOVA - Analysis of covariance");
