Merge pull request loklak#295 from djmgit/typo

fix loklak#294 - fixed typo in CountryTweetMap app
djmgit · Aug 8, 2017 · b423e7b · b423e7b
2 parents 5bcc979 + 4e7b546
commit b423e7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CountryTweetMap/index.html b/CountryTweetMap/index.html
@@ -85,8 +85,8 @@ <h4 class="modal-title">Country vs No.of tweets containing {{tweet}}</h4>
                   </button>
                 </div>
                 <div class="filters">
-                  <input class="start-date form-control date" ng-model="startDate" ng-init="" placeholder="Start Date">
-                  <input class="end-date form-control date" ng-model="endDate" ng-init="" placeholder="End Date">
+                  <input class="start-date form-control date" ng-model="startDate" ng-init="" placeholder="From">
+                  <input class="end-date form-control date" ng-model="endDate" ng-init="" placeholder="To">
                   <input class="count form-control" ng-model="count" ng-init="" placeholder="Count">
                 </div>
                 <div ng-if="isLoading" class="loader">

diff --git a/CountryTweetMap/scripts/app.js b/CountryTweetMap/scripts/app.js
@@ -60,8 +60,8 @@ app.controller("app", function ($scope, $http) {
         if ((sinceDate !== undefined && endDate !== "") && (endDate !== undefined && endDate !== "")) {
             var date1 = new Date(sinceDate);
             var date2 = new Date(endDate);
-            if (endDate < sinceDate) {
-                $scope.error = "End date should be larger than start date";
+            if (date2 < date1) {
+                $scope.error = "To date should be after From date";
                 $scope.showSnackbar();
                 return;
             }