Skip to content

Commit 3b4ea63

Browse files
author
minjk-bl
committed
Fix Groupby edit operation -> clicking on input tag
1 parent 07d3462 commit 3b4ea63

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

‎html/m_apps/groupby.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
</div>
1010
<div>
1111
<label for="vp_gbBy" class="vp-orange-text w80">Groupby</label>
12-
<input type="text" id="vp_gbBy" placeholder="Groupby columns" disabled="">
13-
<button id="vp_gbBySelect" class="vp-button w50">Edit</button>
12+
<input type="text" id="vp_gbBy" placeholder="Groupby columns" readonly="">
1413
<label><input type="checkbox" id="vp_gbByGrouper" disabled=""><span>Grouper</span></label>
1514
<div class="vp-gb-by-grouper-box" style="display:none;">
1615
<input type="number" id="vp_gbByGrouperNumber" class="vp-gb-by-number">
@@ -29,8 +28,7 @@
2928
<hr style="margin: 5px 0;">
3029
<div>
3130
<label for="vp_gbDisplay" class="w80">Columns</label>
32-
<input type="text" id="vp_gbDisplay" placeholder="Display columns" disabled="">
33-
<button id="vp_gbDisplaySelect" class="vp-button w50">Edit</button>
31+
<input type="text" id="vp_gbDisplay" placeholder="Display columns" readonly="">
3432
</div>
3533
<div>
3634
<label for="vp_gbMethodSelect" class="w80">Method</label>

‎js/m_apps/Groupby.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ define([
141141
});
142142

143143
// groupby select button event
144-
$(document).on('click', this.wrapSelector('#vp_gbBySelect'), function() {
144+
$(document).on('click', this.wrapSelector('#vp_gbBy'), function() {
145145
that.openColumnSelector($(that.wrapSelector('#vp_gbBy')), 'Select columns to group');
146146
});
147147

@@ -180,7 +180,7 @@ define([
180180
});
181181

182182
// display select button event
183-
$(document).on('click', this.wrapSelector('#vp_gbDisplaySelect'), function() {
183+
$(document).on('click', this.wrapSelector('#vp_gbDisplay'), function() {
184184
that.openColumnSelector($(that.wrapSelector('#vp_gbDisplay')), 'Select columns to display');
185185
});
186186

@@ -268,7 +268,7 @@ define([
268268
});
269269

270270
// edit target columns
271-
$(document).on('click', this.wrapSelector('.vp-gb-adv-col-selector'), function() {
271+
$(document).on('click', this.wrapSelector('.vp-gb-adv-col'), function() {
272272
var includeList = that.state.display;
273273
if (includeList && includeList.length > 0) {
274274
includeList = includeList.map(col => col.code);
@@ -309,7 +309,7 @@ define([
309309
});
310310

311311
// edit columns naming
312-
$(document).on('click', this.wrapSelector('.vp-gb-adv-naming-selector'), function() {
312+
$(document).on('click', this.wrapSelector('.vp-gb-adv-naming'), function() {
313313
var parentDiv = $(this).parent();
314314
var columns = $(parentDiv).find('.vp-gb-adv-col').data('list');
315315
if (columns && columns.length > 0) {
@@ -318,7 +318,7 @@ define([
318318
var method = $(parentDiv).find('.vp-gb-adv-method').val();
319319
if (!method || method == '' || method == "''") {
320320
// set focus on selecting method tag
321-
$(parentDiv).find('.vp-gb-adv-method-selector').focus();
321+
$(parentDiv).find('.vp-gb-adv-method').focus();
322322
return;
323323
}
324324
that.openNamingPopup($(parentDiv).find('.vp-gb-adv-naming'), columns, method);
@@ -341,12 +341,12 @@ define([
341341
$(document).off('change', this.wrapSelector('#vp_gbVariable'));
342342
$(document).off('click', this.wrapSelector('.vp-gb-df-refresh'));
343343
$(document).off('change', this.wrapSelector('#vp_gbBy'));
344-
$(document).off('click', this.wrapSelector('#vp_gbBySelect'));
344+
$(document).off('click', this.wrapSelector('#vp_gbBy'));
345345
$(document).off('change', this.wrapSelector('#vp_gbByGrouper'));
346346
$(document).off('change', this.wrapSelector('#vp_gbByGrouperNumber'));
347347
$(document).off('change', this.wrapSelector('#vp_gbByGrouperPeriod'));
348348
$(document).off('change', this.wrapSelector('#vp_gbDisplay'));
349-
$(document).off('click', this.wrapSelector('#vp_gbDisplaySelect'));
349+
$(document).off('click', this.wrapSelector('#vp_gbDisplay'));
350350
$(document).off('change', this.wrapSelector('#vp_gbMethodSelect'));
351351
$(document).off('change', this.wrapSelector('#vp_gbAdvanced'));
352352
$(document).off('change', this.wrapSelector('#vp_gbAllocateTo'));
@@ -355,11 +355,11 @@ define([
355355

356356
$(document).off('click', this.wrapSelector('#vp_gbAdvAdd'));
357357
$(document).off('change', this.wrapSelector('.vp-gb-adv-col'));
358-
$(document).off('click', this.wrapSelector('.vp-gb-adv-col-selector'));
358+
$(document).off('click', this.wrapSelector('.vp-gb-adv-col'));
359359
$(document).off('change', this.wrapSelector('.vp-gb-adv-method-selector'));
360360
$(document).off('click', this.wrapSelector('.vp-gb-adv-method-return'));
361361
$(document).off('change', this.wrapSelector('.vp-gb-adv-naming'));
362-
$(document).off('click', this.wrapSelector('.vp-gb-adv-naming-selector'));
362+
$(document).off('click', this.wrapSelector('.vp-gb-adv-naming'));
363363
$(document).off('click', this.wrapSelector('.vp-gb-adv-item-delete'));
364364
$(document).off('click.' + this.uuid);
365365
}
@@ -396,9 +396,8 @@ define([
396396
var page = new com_String();
397397
page.appendFormatLine('<div class="{0}">', 'vp-gb-adv-item');
398398
// target columns
399-
page.appendFormatLine('<input type="text" class="{0}" placeholder="{1}" title="{2}" disabled/>'
399+
page.appendFormatLine('<input type="text" class="{0}" placeholder="{1}" title="{2}" readonly/>'
400400
, 'vp-gb-adv-col', 'Column list', 'Apply All columns, if not selected');
401-
page.appendFormatLine('<button class="{0} {1}">{2}</button>', 'vp-gb-adv-col-selector', 'vp-button w50', 'Edit');
402401
// method select
403402
page.appendFormatLine('<select class="{0}">', 'vp-gb-adv-method-selector');
404403
var defaultMethod = '';
@@ -418,8 +417,7 @@ define([
418417
, '/nbextensions/visualpython/img/arrow_left.svg', 'vp-gb-adv-method-return', 'Return to select method');
419418
page.appendLine('</div>');
420419
// naming
421-
page.appendFormatLine('<input type="text" class="{0}" placeholder="{1}" data-dict={} disabled/>', 'vp-gb-adv-naming', 'Display name');
422-
page.appendFormatLine('<button class="{0} {1}">{2}</button>', 'vp-gb-adv-naming-selector', 'vp-button w50', 'Edit');
420+
page.appendFormatLine('<input type="text" class="{0}" placeholder="{1}" data-dict={} readonly/>', 'vp-gb-adv-naming', 'Display name');
423421
// delete button
424422
page.appendFormatLine('<div class="{0} {1}"><img src="{2}"/></div>', 'vp-gb-adv-item-delete', 'vp-cursor', '/nbextensions/visualpython/img/close_small.svg');
425423
page.appendLine('</div>');

0 commit comments

Comments
 (0)