dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for time picker

Browse Source
This commit is contained in:
Volodymyr Babak 2018-09-13 14:08:55 +03:00
parent 0b379d6b6a
commit 8f72adfb1d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/app/entity-view/entity-view-fieldset.tpl.html
View File

@ -98,19 +98,19 @@
<section layout="column"> <section layout="column">
<section layout="row" layout-align="start start"> <section layout="row" layout-align="start start">
<mdp-date-picker ng-model="startTimeMs" <mdp-date-picker ng-model="startTimeMs"
mdp-max-date="maxStartTimeTs" mdp-max-date="maxStartTimeMs"
mdp-placeholder="{{ 'entity-view.start-ts' | translate }}"></mdp-date-picker> mdp-placeholder="{{ 'entity-view.start-ts' | translate }}"></mdp-date-picker>
<mdp-time-picker ng-model="startTimeMs" <mdp-time-picker ng-model="startTimeMs"
mdp-max-date="maxStartTimeTs" mdp-max-date="maxStartTimeMs"
mdp-placeholder="{{ 'entity-view.start-ts' | translate }}" mdp-placeholder="{{ 'entity-view.start-ts' | translate }}"
mdp-auto-switch="true"></mdp-time-picker> mdp-auto-switch="true"></mdp-time-picker>
</section> </section>
<section layout="row" layout-align="start start"> <section layout="row" layout-align="start start">
<mdp-date-picker ng-model="endTimeMs" <mdp-date-picker ng-model="endTimeMs"
mdp-min-date="minEndTimeTs" mdp-min-date="minEndTimeMs"
mdp-placeholder="{{ 'entity-view.end-ts' | translate }}"></mdp-date-picker> mdp-placeholder="{{ 'entity-view.end-ts' | translate }}"></mdp-date-picker>
<mdp-time-picker ng-model="endTimeMs" <mdp-time-picker ng-model="endTimeMs"
mdp-min-date="minEndTimeTs" mdp-min-date="minEndTimeMs"
mdp-placeholder="{{ 'entity-view.end-ts' | translate }}" mdp-placeholder="{{ 'entity-view.end-ts' | translate }}"
mdp-auto-switch="true"></mdp-time-picker> mdp-auto-switch="true"></mdp-time-picker>
</section> </section>

18
ui/src/app/entity-view/entity-view.directive.js
View File

@ -54,8 +54,8 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
if (scope.entityView.startTimeMs > 0) { if (scope.entityView.startTimeMs > 0) {
scope.startTimeMs = new Date(scope.entityView.startTimeMs); scope.startTimeMs = new Date(scope.entityView.startTimeMs);
} }
if (scope.entityView.endTimeTs > 0) { if (scope.entityView.endTimeMs > 0) {
scope.endTimeTs = new Date(scope.entityView.endTimeTs); scope.endTimeMs = new Date(scope.entityView.endTimeMs);
} }
if (!scope.entityView.keys) { if (!scope.entityView.keys) {
scope.entityView.keys = {}; scope.entityView.keys = {};
@ -78,22 +78,22 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
} }
}); });
scope.$watch('endTimeTs', function (newDate) { scope.$watch('endTimeMs', function (newDate) {
if (newDate) { if (newDate) {
if (newDate.getTime() < scope.minEndTimeTs) { if (newDate.getTime() < scope.minEndTimeMs) {
scope.endTimeTs = angular.copy(scope.minEndTimeTs); scope.endTimeMs = angular.copy(scope.minEndTimeMs);
} }
updateMinMaxDates(); updateMinMaxDates();
} }
}); });
function updateMinMaxDates() { function updateMinMaxDates() {
if (scope.endTimeTs) { if (scope.endTimeMs) {
scope.maxStartTimeMs = angular.copy(new Date(scope.endTimeTs.getTime())); scope.maxStartTimeMs = angular.copy(new Date(scope.endTimeMs.getTime()));
scope.entityView.endTimeTs = scope.endTimeTs.getTime(); scope.entityView.endTimeMs = scope.endTimeMs.getTime();
} }
if (scope.startTimeMs) { if (scope.startTimeMs) {
scope.minEndTimeTs = angular.copy(new Date(scope.startTimeMs.getTime())); scope.minEndTimeMs = angular.copy(new Date(scope.startTimeMs.getTime()));
scope.entityView.startTimeMs = scope.startTimeMs.getTime(); scope.entityView.startTimeMs = scope.startTimeMs.getTime();
} }
} }