From 37f36b4a41cb4c83e7bd95b72fdda19d5ff84995 Mon Sep 17 00:00:00 2001
From: dkhakhkhar <dkhakhkhar@ebay.com>
Date: Tue, 15 Mar 2016 10:22:34 -0700
Subject: [PATCH] KYLIN-1441, Display time column as partition column.

---
 webapp/app/js/controllers/modelEdit.js             |  7 ++++
 webapp/app/js/model/cubeConfig.js                  |  5 +++
 webapp/app/js/model/metaModel.js                   |  8 +++--
 .../modelDesigner/conditions_settings.html         | 39 ++++++++++++++++++++++
 4 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js
index 2de251e..903b584 100644
--- a/webapp/app/js/controllers/modelEdit.js
+++ b/webapp/app/js/controllers/modelEdit.js
@@ -40,6 +40,13 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati
         return columns;
     };
 
+    $scope.getPartitonTimeColumns = function(tableName){
+        var columns = _.filter($scope.getColumnsByTable(tableName),function(column){
+            return column.datatype==="time"||column.datatype==="timestamp"||column.datatype==="string"||column.datatype.startsWith("varchar");
+        });
+        return columns;
+    };
+
     $scope.getColumnsByTable = function (tableName) {
         var temp = [];
         angular.forEach(TableModel.selectProjectTables, function (table) {
diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
index b85789c..60be42c 100644
--- a/webapp/app/js/model/cubeConfig.js
+++ b/webapp/app/js/model/cubeConfig.js
@@ -83,5 +83,10 @@ KylinApp.constant('cubeConfig', {
   partitionDateFormatOpt:[
     'yyyy-MM-dd',
     'yyyyMMdd'
+  ],
+  partitionTimeFormatOpt:[
+    'HH:mm:ss',
+    'HH:mm',
+    'HH'
   ]
 });
diff --git a/webapp/app/js/model/metaModel.js b/webapp/app/js/model/metaModel.js
index 008337f..3f05b3d 100644
--- a/webapp/app/js/model/metaModel.js
+++ b/webapp/app/js/model/metaModel.js
@@ -34,7 +34,9 @@ KylinApp.service('MetaModel',function(){
         "partition_desc" : {
             "partition_date_column" : null,
             "partition_date_start" : null,
-            "partition_type" : 'APPEND'
+            "partition_type" : 'APPEND',
+            "partition_time_column" : null,
+            "partition_time_start" : null
         },
         last_modified:0
     };
@@ -81,7 +83,9 @@ KylinApp.service('MetaModel',function(){
                 "partition_date_column" : null,
                 "partition_date_start" : null,
                 "partition_type" : 'APPEND',
-                "partition_date_format":'yyyy-MM-dd'
+                "partition_date_format":'yyyy-MM-dd',
+                "partition_time_column" : null,
+                "partition_time_start" : null
             },
             last_modified:0
         };
diff --git a/webapp/app/partials/modelDesigner/conditions_settings.html b/webapp/app/partials/modelDesigner/conditions_settings.html
index 95dc4b6..2a46698 100644
--- a/webapp/app/partials/modelDesigner/conditions_settings.html
+++ b/webapp/app/partials/modelDesigner/conditions_settings.html
@@ -74,6 +74,45 @@
           </div>
         </div>
 
+        <!--Partition Time Column-->
+        <div class="form-group">
+          <div class="row">
+            <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Partition Time Column</b></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="">--Select Partition Column--</option>
+              </select>
+              <small class="help-block text-red" ng-show="state.mode=='edit'">(Column Type should be TIME Type)</small>
+
+                    <span ng-if="state.mode=='view'">
+                        {{!!(modelsManager.selectedModel.partition_desc.partition_time_column)?modelsManager.selectedModel.partition_desc.partition_time_column: ''}}</span>
+            </div>
+          </div>
+        </div>
+
+        <!--Time Format-->
+        <div class="form-group">
+          <div class="row">
+            <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Time Format</b></label>
+            <div class="col-xs-12 col-sm-6">
+              <select style="width: 100%" chosen
+                      ng-required="modelsManager.selectedModel.partition_desc.partition_time_format"
+                      ng-model="modelsManager.selectedModel.partition_desc.partition_time_format"
+                      ng-if="state.mode=='edit'"
+                      data-placement=""
+                      ng-options="ddt as ddt for ddt in cubeConfig.partitionTimeFormatOpt">
+                <option value="">--Select Time Format--</option>
+              </select>
+              <span ng-if="state.mode=='view'&&modelsManager.selectedModel.partition_desc.partition_time_column">{{(modelsManager.selectedModel.partition_desc.partition_time_format)}}</span>
+            </div>
+          </div>
+        </div>
+
           <div class="form-group" ng-show="userService.hasRole('ROLE_ADMIN')">
               <div class="row">
                   <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Cube Size</b></label>
-- 
2.5.4 (Apple Git-61)