From 89af5e456fb0d9fa4a49c18931d6c87d81c4a558 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Fri, 24 Oct 2014 17:14:18 +0800
Subject: [PATCH] combine rowkey & aggression in one page

---
 webapp/app/js/controllers/cubeSchema.js            |   3 +-
 .../partials/cubeDesigner/advanced_settings.html   | 118 +++++++++++++++++++++
 .../partials/cubeDesigner/aggression_group.html    |  43 --------
 webapp/app/partials/cubeDesigner/rowkey.html       |  74 -------------
 4 files changed, 119 insertions(+), 119 deletions(-)
 create mode 100644 webapp/app/partials/cubeDesigner/advanced_settings.html
 delete mode 100644 webapp/app/partials/cubeDesigner/aggression_group.html
 delete mode 100644 webapp/app/partials/cubeDesigner/rowkey.html

diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index 17b6291..0c8c2ff 100644
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -16,8 +16,7 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
         {title: 'Refresh Setting', src: 'partials/cubeDesigner/incremental.html', isComplete: false}
     ];
     if (UserService.hasRole("ROLE_ADMIN")) {
-        $scope.wizardSteps.push({title: 'Rowkeys', src: 'partials/cubeDesigner/rowkey.html', isComplete: false});
-        $scope.wizardSteps.push({title: 'Aggreation Groups', src: 'partials/cubeDesigner/aggression_group.html', isComplete: false});
+            $scope.wizardSteps.push({title: 'Advanced Setting', src: 'partials/cubeDesigner/advanced_settings.html', isComplete: false});
     }
     $scope.wizardSteps.push({title: 'Overview', src: 'partials/cubeDesigner/overview.html', isComplete: false});
 
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
new file mode 100644
index 0000000..5e86587
--- /dev/null
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -0,0 +1,118 @@
+<div>
+    <div class="form-group">
+        <h4 style="margin-left:42px">Aggreation Groups</h4>
+        <table style="margin-left:42px; width:92%"
+               ng-if="cubeMetaFrame.rowkey.aggregation_groups.length > 0"
+               class="table table-hover list">
+            <tr class="row">
+                <th class="col-xs-1">ID</th>
+                <th class="col-xs-10">Aggregation Groups</th>
+                <th ng-if="state.mode=='edit'" class="col-xs-1"></th>
+            </tr>
+
+            <tr ng-repeat="aggregation_groups in cubeMetaFrame.rowkey.aggregation_groups" class="row">
+                <td class="col-xs-1">
+                    <!-- ID -->
+                    <b>{{($index + 1)}}</b>
+                </td>
+                <td class="col-xs-11">
+                    <!-- Dimensions -->
+                    <select ng-if="state.mode=='edit'" style="width: 100%"
+                            ng-model="aggregation_groups" required chosen multiple
+                            ng-change="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups, $index, aggregation_groups)"
+                            ng-options="dimension.name as dimension.name for dimension in cubeMetaFrame.dimensions">
+                    </select>
+
+                    <p ng-if="state.mode=='view'" style="word-wrap: break-word; word-break: normal;max-width: 1000px ">{{aggregation_groups}}</p>
+                </td>
+                <td ng-if="state.mode=='edit'" class="col-xs-1">
+                    <button class="btn btn-xs btn-info"
+                            ng-click="removeElement(cubeMetaFrame.rowkey.aggregation_groups, aggregation_groups)"><i
+                            class="fa fa-minus"></i>
+                    </button>
+                </td>
+            </tr>
+        </table>
+
+        <button class="btn btn-sm btn-info" style="margin-left:42px" ng-click="addNewAggregationGroup()"
+                ng-show="state.mode=='edit'">New Aggregation Group<i class="fa fa-plus"></i>
+        </button>
+
+
+    </div>
+
+
+    <div class="form-group">
+        <h4 style="margin-left:42px">Rowkeys</h4>
+        <table style="margin-left:42px; width:92%"
+               ng-if="cubeMetaFrame.rowkey.rowkey_columns.length > 0"
+               class="table table-hover list">
+            <tr>
+                <th>ID</th>
+                <th>Column</th>
+                <th>Length</th>
+                <th>Dictionary</th>
+                <th>Mandatory</th>
+                <th ng-if="state.mode=='edit'"></th>
+            </tr>
+
+            <tr ng-repeat="rowkey_column in cubeMetaFrame.rowkey.rowkey_columns">
+                <td>
+                    <!-- ID -->
+                    <b>{{($index + 1)}}</b>
+                </td>
+                <td>
+                    <!--Column Name -->
+                    <input type="text" placeholder="Column Name.." ng-if="state.mode=='edit'"
+                           tooltip="rowkey column name.." tooltip-trigger="focus"
+                           ng-model="rowkey_column.column">
+
+                    <span ng-if="state.mode=='view'">{{rowkey_column.column}}</span>
+                </td>
+                <td>
+                    <!--Column Length -->
+                    <input type="text" placeholder="Column Length.." ng-if="state.mode=='edit'"
+                           tooltip="rowkey column length.." tooltip-trigger="focus"
+                           ng-model="rowkey_column.length">
+
+                    <span ng-if="state.mode=='view'">{{rowkey_column.length}}</span>
+                </td>
+                <td>
+                    <!--Use Dictionary-->
+                    <div>
+                        <select ng-if="state.mode=='edit'"
+                                chosen ng-model="rowkey_column.dictionary"
+                                ng-options="dt as dt for dt in dictionaries">
+                            <option value="">-- choose dictionary --</option>
+                        </select>
+
+                        <span ng-if="state.mode=='view'">{{rowkey_column.dictionary}}</span>
+                    </div>
+                </td>
+                <td>
+                    <!-- Mandatory -->
+                    <button type="button " ng-if="state.mode=='edit'"
+                            class="btn btn-xs btn-default {{rowkey_column.mandatory? 'active':''}}"
+                            ng-model="rowkey_column.mandatory"
+                            btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false">
+                        {{rowkey_column.mandatory? 'Y':'N'}}
+                    </button>
+
+                    <span ng-if="state.mode=='view'">{{rowkey_column.mandatory? 'Y':'N'}}</span>
+                </td>
+                <td ng-if="state.mode=='edit'">
+                    <button class="btn btn-xs btn-info"
+                            ng-click="removeElement(cubeMetaFrame.rowkey.rowkey_columns, rowkey_column)"><i
+                            class="fa fa-minus"></i>
+                    </button>
+                </td>
+            </tr>
+        </table>
+
+        <button class="btn btn-sm btn-info" style="margin-left:42px"
+                ng-click="addNewRowkeyColumn()" ng-show="state.mode=='edit'">New Rowkey
+            Column<i
+                    class="fa fa-plus"></i></button>
+    </div>
+</div>
+
diff --git a/webapp/app/partials/cubeDesigner/aggression_group.html b/webapp/app/partials/cubeDesigner/aggression_group.html
deleted file mode 100644
index 63196b3..0000000
--- a/webapp/app/partials/cubeDesigner/aggression_group.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div>
-    <div class="form-group">
-
-        <table style="margin-left:42px; width:92%"
-               ng-if="cubeMetaFrame.rowkey.aggregation_groups.length > 0"
-               class="table table-hover list">
-            <tr class="row">
-                <th class="col-xs-1">ID</th>
-                <th class="col-xs-10">Aggregation Groups</th>
-                <th ng-if="state.mode=='edit'" class="col-xs-1"></th>
-            </tr>
-
-            <tr ng-repeat="aggregation_groups in cubeMetaFrame.rowkey.aggregation_groups" class="row">
-                <td class="col-xs-1">
-                    <!-- ID -->
-                    <b>{{($index + 1)}}</b>
-                </td>
-                <td class="col-xs-10">
-                    <!-- Dimensions -->
-                    <select ng-if="state.mode=='edit'" style="width: 100%"
-                            ng-model="aggregation_groups" required chosen multiple
-                            ng-change="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups, $index, aggregation_groups)"
-                            ng-options="dimension.name as dimension.name for dimension in cubeMetaFrame.dimensions">
-                    </select>
-
-                    <p ng-if="state.mode=='view'" style="word-wrap: break-word; word-break: normal;max-width: 1000px ">{{aggregation_groups}}</p>
-                </td>
-                <td ng-if="state.mode=='edit'" class="col-xs-1">
-                    <button class="btn btn-xs btn-info"
-                            ng-click="removeElement(cubeMetaFrame.rowkey.aggregation_groups, aggregation_groups)"><i
-                            class="fa fa-minus"></i>
-                    </button>
-                </td>
-            </tr>
-        </table>
-
-        <button class="btn btn-sm btn-info" style="margin-left:42px" ng-click="addNewAggregationGroup()"
-                ng-show="state.mode=='edit'">New Aggregation Group<i class="fa fa-plus"></i>
-        </button>
-
-
-    </div>
-</div>
\ No newline at end of file
diff --git a/webapp/app/partials/cubeDesigner/rowkey.html b/webapp/app/partials/cubeDesigner/rowkey.html
deleted file mode 100644
index 44443e0..0000000
--- a/webapp/app/partials/cubeDesigner/rowkey.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<div>
-    <div class="form-group">
-
-        <table style="margin-left:42px; width:92%"
-               ng-if="cubeMetaFrame.rowkey.rowkey_columns.length > 0"
-               class="table table-hover list">
-            <tr>
-                <th>ID</th>
-                <th>Column</th>
-                <th>Length</th>
-                <th>Dictionary</th>
-                <th>Mandatory</th>
-                <th ng-if="state.mode=='edit'"></th>
-            </tr>
-
-            <tr ng-repeat="rowkey_column in cubeMetaFrame.rowkey.rowkey_columns">
-                <td>
-                    <!-- ID -->
-                    <b>{{($index + 1)}}</b>
-                </td>
-                <td>
-                    <!--Column Name -->
-                    <input type="text" placeholder="Column Name.." ng-if="state.mode=='edit'"
-                           tooltip="rowkey column name.." tooltip-trigger="focus"
-                           ng-model="rowkey_column.column">
-
-                    <span ng-if="state.mode=='view'">{{rowkey_column.column}}</span>
-                </td>
-                <td>
-                    <!--Column Length -->
-                    <input type="text" placeholder="Column Length.." ng-if="state.mode=='edit'"
-                           tooltip="rowkey column length.." tooltip-trigger="focus"
-                           ng-model="rowkey_column.length">
-
-                    <span ng-if="state.mode=='view'">{{rowkey_column.length}}</span>
-                </td>
-                <td>
-                    <!--Use Dictionary-->
-                    <div>
-                        <select ng-if="state.mode=='edit'"
-                                chosen ng-model="rowkey_column.dictionary"
-                                ng-options="dt as dt for dt in dictionaries">
-                            <option value="">-- choose dictionary --</option>
-                        </select>
-
-                        <span ng-if="state.mode=='view'">{{rowkey_column.dictionary}}</span>
-                    </div>
-                </td>
-                <td>
-                    <!-- Mandatory -->
-                    <button type="button " ng-if="state.mode=='edit'"
-                            class="btn btn-xs btn-default {{rowkey_column.mandatory? 'active':''}}"
-                            ng-model="rowkey_column.mandatory"
-                            btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false">
-                        {{rowkey_column.mandatory? 'Y':'N'}}
-                    </button>
-
-                    <span ng-if="state.mode=='view'">{{rowkey_column.mandatory? 'Y':'N'}}</span>
-                </td>
-                <td ng-if="state.mode=='edit'">
-                    <button class="btn btn-xs btn-info"
-                            ng-click="removeElement(cubeMetaFrame.rowkey.rowkey_columns, rowkey_column)"><i
-                            class="fa fa-minus"></i>
-                    </button>
-                </td>
-            </tr>
-        </table>
-
-        <button class="btn btn-sm btn-info" style="margin-left:42px"
-                ng-click="addNewRowkeyColumn()" ng-show="state.mode=='edit'">New Rowkey
-            Column<i
-                    class="fa fa-plus"></i></button>
-    </div>
-</div>
\ No newline at end of file