From 95c711fe07cabf901d361eff03d1e248753874e7 Mon Sep 17 00:00:00 2001
From: chenzhx <346839943@qq.com>
Date: Tue, 14 Feb 2017 17:41:10 +0800
Subject: [PATCH] KYLIN 2445 UI: select cube engine in Advanced setting page

---
 webapp/app/js/model/cubeConfig.js                  |  4 +++
 .../partials/cubeDesigner/advanced_settings.html   | 31 ++++++++++++++++++----
 .../modelDesigner/conditions_settings.html         | 21 ---------------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
index 35af1fc17..dc5ff7a6f 100644
--- a/webapp/app/js/model/cubeConfig.js
+++ b/webapp/app/js/model/cubeConfig.js
@@ -23,6 +23,10 @@ KylinApp.constant('cubeConfig', {
   measureExpressions: ['SUM', 'MIN', 'MAX', 'COUNT', 'COUNT_DISTINCT',"TOP_N", 'RAW','EXTENDED_COLUMN','PERCENTILE'],
   dimensionDataTypes: ["string", "tinyint", "int", "bigint", "date"],
   cubePartitionTypes: ['APPEND'],
+  engineType:[
+    {name:'MapReduce',value: 2},
+    {name:'Spark(Beta)',value: 4}
+  ],
   joinTypes: [
     {name: 'Left', value: 'left'},
     {name: 'Inner', value: 'inner'}
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index f26722b35..ffa758951 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -268,7 +268,24 @@
               </div>
           </div>
         </div>
-        <div class="form-group large-popover" style="overflow:auto">
+        <!--Cube Engine-->
+        <div class="form-group large-popover" style="margin-bottom:30px;">
+          <h3 style="margin-left:42px;margin-bottom:30px;">Cube Engine  <i kylinpopover placement="right" title="Cube Engine" template="CubeEngineTip.html" class="fa fa-info-circle"></i></h3>
+          <div class="row" style="margin-left:42px">
+            <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Engine Type :</b></label>
+            <div class="col-xs-12 col-sm-6">
+              <select style="width: 100%" chosen
+                      ng-model="cubeMetaFrame.engine_type"
+                      ng-if="state.mode=='edit'"  ng-disabled="instance.segments.length>0"
+                      ng-options="et.value as et.name for et in cubeConfig.engineType">
+                <option value="">--Select Engine Type--</option>
+              </select>
+              <span ng-if="state.mode=='view'&&cubeMetaFrame.engine_type==2">MapReduce</span>
+              <span ng-if="state.mode=='view'&&cubeMetaFrame.engine_type==4">Spark(Beta)</span>
+            </div>
+          </div>
+        </div>
+        <div class="form-group large-popover">
           <h3 style="margin-left:42px">Advanced Dictionaries  <i kylinpopover placement="right" title="Advanced Dictionaries" template="AdvancedDictionariesTip.html" class="fa fa-info-circle"></i></h3>
           <div style="margin-left:42px">
             <div class="box-body">
@@ -388,9 +405,8 @@
              <button class="btn btn-link" ng-click="clearNewDictionaries()">Cancel</button>
            </div>
          </div>
-
          <!--Edit ColumnFamily-->
-         <div class="form-group large-popover" style="overflow:auto">
+         <div class="form-group large-popover" >
            <h3 style="margin-left:42px">Advanced ColumnFamily  <i kylinpopover placement="right" title="Advanced ColumnFamily" template="AdvancedColumnFamilyTip.html" class="fa fa-info-circle"></i></h3>
            <div style="margin-left:42px">
              <div class="box-body">
@@ -436,9 +452,7 @@
 
                      <td class="col-xs-10">
                        <ui-select
-                         ng-if="state.mode=='edit'"
                          style="width: 100%"
-                         autofocus="true"
                          close-on-select="false"
                          on-select="refreshColumnFamily(cubeMetaFrame.hbase_mapping.column_family, rowIndex, colFamily)"
                          on-remove="refreshColumnFamily(cubeMetaFrame.hbase_mapping.column_family, rowIndex, colFamily)"
@@ -509,3 +523,10 @@
         you could assign these measures to more column family.</h4>
   </div>
 </script>
+<script type="text/ng-template" id="CubeEngineTip.html" >
+  <div>
+    <h4>
+       Select cube engine for building cube.
+    </h4>
+  </div>
+</script>
diff --git a/webapp/app/partials/modelDesigner/conditions_settings.html b/webapp/app/partials/modelDesigner/conditions_settings.html
index a39c8b3f4..6775bcb14 100644
--- a/webapp/app/partials/modelDesigner/conditions_settings.html
+++ b/webapp/app/partials/modelDesigner/conditions_settings.html
@@ -79,27 +79,6 @@
               </div>
             </div>
           </div>
-<!--          &lt;!&ndash;Partition Time Column&ndash;&gt;
-          <div class="form-group" ng-if="partitionColumn.hasSeparateTimeColumn == true">
-            <div class="row middle-popover">
-              <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Partition Time Column</b>  <i kylinpopover placement="right" title="Partition Time Column" template="partitionTimeTip.html" class="fa fa-info-circle"></i></label>
-              <div class="col-xs-12 col-sm-6">
-
-                <select style="width: 100%" chosen data-placeholder="e.g. DEFAULT.TEST_KYLIN_FACT.CAL_DT"
-                        ng-model="modelsManager.selectedModel.partition_desc.partition_time_column"
-                        ng-if="state.mode=='edit'"
-                        data-placement=""
-                        ng-options="modelsManager.selectedModel.fact_table+'.'+columns.name as modelsManager.selectedModel.fact_table+'.'+columns.name for columns in getPartitonTimeColumns(modelsManager.selectedModel.fact_table)" >
-                  <option value="">&#45;&#45;Select Partition Column&#45;&#45;</option>
-                </select>
-                &lt;!&ndash;<small class="text-info" ng-show="state.mode=='edit'">(Column Type should be TIME Type)</small>&ndash;&gt;
-
-                      <span ng-if="state.mode=='view'">
-                          {{!!(modelsManager.selectedModel.partition_desc.partition_time_column)?modelsManager.selectedModel.partition_desc.partition_time_column: ''}}</span>
-              </div>
-            </div>
-          </div>-->
-
           <!--Partition Time Column-->
           <div class="form-group" ng-if="partitionColumn.hasSeparateTimeColumn == true">
             <div class="row middle-popover">
-- 
2.11.0.windows.1