Edit Groupby app's location of reset index option

minjk-bl · minjk-bl · commit c476121a6180 · 2022-06-15T14:25:01.000+09:00
diff --git a/html/m_apps/groupby.html b/html/m_apps/groupby.html
@@ -18,13 +18,6 @@
                 </select>
             </div>
         </div>
-        <div>
-            <label for="vp_gbResetIndex" class="w80">Reset Index</label>
-            <select id="vp_gbResetIndex">
-                <option value="no">No</option>
-                <option value="yes">Yes</option>
-            </select>
-        </div>
         <hr style="margin: 5px 0;">
         <div>
             <label for="vp_gbDisplay" class="w80">Columns</label>
@@ -46,6 +39,7 @@
         <div>
             <label for="vp_gbAllocateTo" class="w80">Allocate to</label>
             <input type="text" id="vp_gbAllocateTo" placeholder="New variable name">
+            <label><input type="checkbox" id="vp_gbResetIndex"><span>Reset Index</span></label>
             <label style="display:none;"><input type="checkbox" id="vp_gbToFrame"><span>To DataFrame</span></label>
         </div>
     </div>
diff --git a/js/m_apps/Groupby.js b/js/m_apps/Groupby.js
@@ -226,7 +226,7 @@ define([
             
             // reset index checkbox event
             $(document).on('change', this.wrapSelector('#vp_gbResetIndex'), function() {
-                that.state.resetIndex = $(this).val() == 'yes';
+                that.state.resetIndex = $(this).prop('checked');
             });
             
             //====================================================================
@@ -615,7 +615,7 @@ define([
             // Grouper
             if (useGrouper) {
                 byStr = com_util.formatString("pd.Grouper(key={0}, freq='{1}')", byStr, grouperNumber + grouperPeriod);
-            } else if (resetIndex == true) {
+            } else if (resetIndex === true) {
                 // as_index option cannot use with Grouper -> use .reset_index() at the end
                 byStr += ', as_index=False';
             }
@@ -787,7 +787,6 @@ define([
             $(this.wrapSelector('#vp_gbVariable')).val(variable);
             $(this.wrapSelector('#vp_gbBy')).val(groupby.map(col=>col.code).join(','));
             $(this.wrapSelector('#vp_gbBy')).data('list', groupby);
-            $(this.wrapSelector('#vp_gbResetIndex')).val(resetIndex?'yes':'no');
             if (useGrouper) {
                 $(this.wrapSelector('#vp_gbByGrouper')).removeAttr('disabled');
                 $(this.wrapSelector('#vp_gbByGrouper')).prop('checked', useGrouper);
@@ -805,6 +804,7 @@ define([
             }
             $(this.wrapSelector('#vp_gbAllocateTo')).val(allocateTo);
             $(this.wrapSelector('#vp_gbToFrame')).val(toFrame);
+            $(this.wrapSelector('#vp_gbResetIndex')).prop('checked', resetIndex);
 
             if (advPageDom != '') {
                 $(this.wrapSelector('.vp-gb-adv-box')).html(advPageDom);
