Skip to content

Commit 2312eb2

Browse files
author
minjk-bl
committed
Apps > Groupby, Merge, Reshape prototype
1 parent 0e8a242 commit 2312eb2

6 files changed

Lines changed: 689 additions & 66 deletions

File tree

‎src/api_block/createAppsBtn.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,10 @@ define([
9090
case 'profiling':
9191
case 'pdf':
9292
case 'groupby':
93-
blockContainer.setSelectBlock(null);
94-
blockContainer.createAppsPage(menu, file, config);
95-
break;
9693
case 'merge':
97-
// TODO: Merge
98-
break;
9994
case 'reshape':
100-
// TODO: Reshape
95+
blockContainer.setSelectBlock(null);
96+
blockContainer.createAppsPage(menu, file, config);
10197
break;
10298
}
10399
});

‎src/api_block/index.html‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -54,62 +54,7 @@
5454
<div class="vp-block-group-box vp-block-group-box-apps">
5555
<input type="hidden" id="vp_appsCode"/>
5656
<div class="vp-apiblock-menu-apps-grid">
57-
<!-- <div class="vp-apiblock-menu-apps-item line1" data-menu="import" title="import">
58-
<img src="/nbextensions/visualpython/resource/apps/apps_import.svg">
59-
<div class="vp-apiblock-menu-apps-name">Import</div>
60-
</div>
61-
<div class="vp-apiblock-menu-apps-item line1" data-menu="markdown" title="Markdown">
62-
<img src="/nbextensions/visualpython/resource/apps/apps_markdown.svg">
63-
<div class="vp-apiblock-menu-apps-name">Markdown</div>
64-
</div>
65-
<div class="vp-apiblock-menu-apps-item line1" data-menu="variable" title="Variable">
66-
<img src="/nbextensions/visualpython/resource/apps/apps_variable.svg">
67-
<div class="vp-apiblock-menu-apps-name">Variable</div>
68-
</div>
69-
<div class="vp-apiblock-menu-apps-item line1" data-menu="snippets" title="Snippets">
70-
<img src="/nbextensions/visualpython/resource/apps/apps_snippets.svg">
71-
<div class="vp-apiblock-menu-apps-name">Snippets</div>
72-
</div>
73-
<div class="vp-apiblock-menu-apps-item line2" data-menu="file" title="File">
74-
<img src="/nbextensions/visualpython/resource/apps/apps_file.svg">
75-
<div class="vp-apiblock-menu-apps-name">File</div>
76-
</div>
77-
<div class="vp-apiblock-menu-apps-item line2" data-menu="instance" title="Instance">
78-
<img src="/nbextensions/visualpython/resource/apps/apps_instance.svg">
79-
<div class="vp-apiblock-menu-apps-name">Instance</div>
80-
</div>
81-
<div class="vp-apiblock-menu-apps-item line2" data-menu="subset" title="Subset">
82-
<img src="/nbextensions/visualpython/resource/apps/apps_subset.svg">
83-
<div class="vp-apiblock-menu-apps-name">Subset</div>
84-
</div>
85-
<div class="vp-apiblock-menu-apps-item line2" data-menu="frame" title="Frame">
86-
<img src="/nbextensions/visualpython/resource/apps/apps_frame.svg">
87-
<div class="vp-apiblock-menu-apps-name">Frame</div>
88-
</div>
89-
<div class="vp-apiblock-menu-apps-item line3" data-menu="chart" title="Chart">
90-
<img src="/nbextensions/visualpython/resource/apps/apps_chart.svg">
91-
<div class="vp-apiblock-menu-apps-name">Chart</div>
92-
</div>
93-
<div class="vp-apiblock-menu-apps-item line3" data-menu="profiling" title="Pandas Profiling">
94-
<img src="/nbextensions/visualpython/resource/apps/apps_white.svg">
95-
<div class="vp-apiblock-menu-apps-name">Profiling</div>
96-
</div>
97-
<div class="vp-apiblock-menu-apps-item line3" data-menu="pdf" title="PDF">
98-
<img src="/nbextensions/visualpython/resource/apps/apps_white.svg">
99-
<div class="vp-apiblock-menu-apps-name">PDF</div>
100-
</div>
101-
<div class="vp-apiblock-menu-apps-item line3" data-menu="groupby" title="Groupby">
102-
<img src="/nbextensions/visualpython/resource/apps/apps_groupby.svg">
103-
<div class="vp-apiblock-menu-apps-name">Groupby</div>
104-
</div>
105-
<div class="vp-apiblock-menu-apps-item preparing" data-menu="merge" title="Work In Progress">
106-
<img src="/nbextensions/visualpython/resource/apps/apps_merge.svg">
107-
<div class="vp-apiblock-menu-apps-name">Merge</div>
108-
</div>
109-
<div class="vp-apiblock-menu-apps-item preparing" data-menu="reshape" title="Work In Progress">
110-
<img src="/nbextensions/visualpython/resource/apps/apps_reshape.svg">
111-
<div class="vp-apiblock-menu-apps-name">Reshape</div>
112-
</div> -->
57+
<!-- Apps menu -->
11358
</div>
11459
</div>
11560

‎src/api_block/init.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ define([
128128
blockContainer.setImportPackageThis(apiBlockPackage);
129129

130130
/** Apps menu 생성 */
131-
// TODO:
132-
// vp-apiblock-menu-apps-grid
133131
var appsList = [
134132
'import', 'file', 'variable', 'snippets', 'frame', 'subset', 'instance', 'groupby',
135133
'merge', 'reshape', 'chart', 'markdown', 'pdf', 'profiling'

‎src/common/vpGroupby.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ define([
250250
var code = this.generateCode();
251251

252252
// save state for block
253-
this.saveState();
253+
this._saveState();
254254

255255
if (this.pageThis) {
256256
$(this.pagethis._wrapSelector('#' + this.targetId)).val(code);
@@ -282,7 +282,7 @@ define([
282282
generateCode() {
283283
var code = new sb.StringBuilder();
284284
// TODO: generate code
285-
285+
286286
return code.toString();
287287
}
288288

0 commit comments

Comments
 (0)