diff --git a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js index 44b5eef7..b8ccef3a 100644 --- a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js +++ b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js @@ -11,24 +11,22 @@ app.controller('TextMessageOptionController', function( endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, - eventHandlers:{ 'apply.daterangepicker':function(ev,picker){ //$scope.execute(); } } - }; $scope.execute = function() { diff --git a/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js b/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js index 6a84f101..9d76829c 100644 --- a/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js +++ b/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js @@ -11,24 +11,22 @@ app.controller('WebMessageOptionController', function( endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, - eventHandlers:{ 'apply.daterangepicker':function(ev,picker){ //$scope.execute(); } } - }; $scope.execute = function() { diff --git a/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js b/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js index 0b46f7d1..68944dd4 100644 --- a/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js +++ b/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js @@ -11,24 +11,22 @@ app.controller('WechatMessageOptionController', function( endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, - eventHandlers:{ 'apply.daterangepicker':function(ev,picker){ //$scope.execute(); } } - }; $scope.execute = function() { diff --git a/admin/views/fdd/emailmessage.html b/admin/views/fdd/emailmessage.html index a052bfb0..a50da955 100644 --- a/admin/views/fdd/emailmessage.html +++ b/admin/views/fdd/emailmessage.html @@ -5,7 +5,9 @@