简柏林 / thingskit · Commits

Commit 8f72adfb1d08c03558d8e2a56b2e88fa3fab1e9c

Authored by Volodymyr Babak
1 parent 0b379d6b

Fixes for time picker

Inline Side-by-side
Showing 2 changed files with 13 additions and 13 deletions
@@ -98,19 +98,19 @@ @@ -98,19 +98,19 @@
98 <section layout="column"> 98 <section layout="column">
99 <section layout="row" layout-align="start start"> 99 <section layout="row" layout-align="start start">
100 <mdp-date-picker ng-model="startTimeMs" 100 <mdp-date-picker ng-model="startTimeMs"
101 - mdp-max-date="maxStartTimeTs" 101 + mdp-max-date="maxStartTimeMs"
102 mdp-placeholder="{{ 'entity-view.start-ts' | translate }}"></mdp-date-picker> 102 mdp-placeholder="{{ 'entity-view.start-ts' | translate }}"></mdp-date-picker>
103 <mdp-time-picker ng-model="startTimeMs" 103 <mdp-time-picker ng-model="startTimeMs"
104 - mdp-max-date="maxStartTimeTs" 104 + mdp-max-date="maxStartTimeMs"
105 mdp-placeholder="{{ 'entity-view.start-ts' | translate }}" 105 mdp-placeholder="{{ 'entity-view.start-ts' | translate }}"
106 mdp-auto-switch="true"></mdp-time-picker> 106 mdp-auto-switch="true"></mdp-time-picker>
107 </section> 107 </section>
108 <section layout="row" layout-align="start start"> 108 <section layout="row" layout-align="start start">
109 <mdp-date-picker ng-model="endTimeMs" 109 <mdp-date-picker ng-model="endTimeMs"
110 - mdp-min-date="minEndTimeTs" 110 + mdp-min-date="minEndTimeMs"
111 mdp-placeholder="{{ 'entity-view.end-ts' | translate }}"></mdp-date-picker> 111 mdp-placeholder="{{ 'entity-view.end-ts' | translate }}"></mdp-date-picker>
112 <mdp-time-picker ng-model="endTimeMs" 112 <mdp-time-picker ng-model="endTimeMs"
113 - mdp-min-date="minEndTimeTs" 113 + mdp-min-date="minEndTimeMs"
114 mdp-placeholder="{{ 'entity-view.end-ts' | translate }}" 114 mdp-placeholder="{{ 'entity-view.end-ts' | translate }}"
115 mdp-auto-switch="true"></mdp-time-picker> 115 mdp-auto-switch="true"></mdp-time-picker>
116 </section> 116 </section>
@@ -54,8 +54,8 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t @@ -54,8 +54,8 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
54 if (scope.entityView.startTimeMs > 0) { 54 if (scope.entityView.startTimeMs > 0) {
55 scope.startTimeMs = new Date(scope.entityView.startTimeMs); 55 scope.startTimeMs = new Date(scope.entityView.startTimeMs);
56 } 56 }
57 - if (scope.entityView.endTimeTs > 0) {  
58 - scope.endTimeTs = new Date(scope.entityView.endTimeTs); 57 + if (scope.entityView.endTimeMs > 0) {
  58 + scope.endTimeMs = new Date(scope.entityView.endTimeMs);
59 } 59 }
60 if (!scope.entityView.keys) { 60 if (!scope.entityView.keys) {
61 scope.entityView.keys = {}; 61 scope.entityView.keys = {};
@@ -78,22 +78,22 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t @@ -78,22 +78,22 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
78 } 78 }
79 }); 79 });
80 80
81 - scope.$watch('endTimeTs', function (newDate) { 81 + scope.$watch('endTimeMs', function (newDate) {
82 if (newDate) { 82 if (newDate) {
83 - if (newDate.getTime() < scope.minEndTimeTs) {  
84 - scope.endTimeTs = angular.copy(scope.minEndTimeTs); 83 + if (newDate.getTime() < scope.minEndTimeMs) {
  84 + scope.endTimeMs = angular.copy(scope.minEndTimeMs);
85 } 85 }
86 updateMinMaxDates(); 86 updateMinMaxDates();
87 } 87 }
88 }); 88 });
89 89
90 function updateMinMaxDates() { 90 function updateMinMaxDates() {
91 - if (scope.endTimeTs) {  
92 - scope.maxStartTimeMs = angular.copy(new Date(scope.endTimeTs.getTime()));  
93 - scope.entityView.endTimeTs = scope.endTimeTs.getTime(); 91 + if (scope.endTimeMs) {
  92 + scope.maxStartTimeMs = angular.copy(new Date(scope.endTimeMs.getTime()));
  93 + scope.entityView.endTimeMs = scope.endTimeMs.getTime();
94 } 94 }
95 if (scope.startTimeMs) { 95 if (scope.startTimeMs) {
96 - scope.minEndTimeTs = angular.copy(new Date(scope.startTimeMs.getTime())); 96 + scope.minEndTimeMs = angular.copy(new Date(scope.startTimeMs.getTime()));
97 scope.entityView.startTimeMs = scope.startTimeMs.getTime(); 97 scope.entityView.startTimeMs = scope.startTimeMs.getTime();
98 } 98 }
99 } 99 }