Merge pull request #3 from liuliquan/dev

huangqun · web-flow · commit d91ebbc02c04 · 2017-03-08T08:31:48.000+08:00
tags sync
diff --git a/src/app/app.js b/src/app/app.js
@@ -99,14 +99,20 @@ angular.module('supportAdminApp', [
           url: '/tags',
           templateUrl: 'app/tags/tags.html',
           data: { pageTitle: 'Tags' },
-          controller: function ($scope, $state) {
+          controller: function ($scope, $state, TagService) {
             $scope.$state = $state;
             $scope.tagDomains = [{
               value: 'skills',
               name: 'Skills'
             }, {
               value: 'events',
               name: 'Events'
+            }, {
+              value: 'technology',
+              name: 'Technology'
+            }, {
+              value: 'platform',
+              name: 'Platform'
             }];
 
             $scope.tagCategories = [{
@@ -128,6 +134,21 @@ angular.module('supportAdminApp', [
               value: 'pending',
               name: 'Pending'
             }];
+
+            TagService.getTechnologyStatuses().then(function(techStatuses) {
+              _.forEach(techStatuses, function(status) {
+                status.value = _.lowerCase(status.description);
+                status.name = status.description;
+              });
+              $scope.techStatuses = techStatuses;
+            });
+            $scope.getTagStatuses = function(domainType) {
+              if (domainType === 'technology') {
+                return $scope.techStatuses;
+              } else {
+                return $scope.tagStatuses;
+              }
+            }
           }
         })
         .state('index.tags.list', {
diff --git a/src/app/tags/tags.edit.controller.js b/src/app/tags/tags.edit.controller.js
@@ -14,8 +14,10 @@ module.controller('EditTagCtrl', ['$rootScope','$scope', 'TagService', '$state',
         $scope.loading = false;
         $timeout(function(){
            $scope.editTag = data;
+           $scope.editTag.previousDomain = data.domain;
            $scope.editForm.synonyms = Array.isArray($scope.editTag.synonyms)?  $scope.editTag.synonyms.join(','):'';
           angular.forEach($scope.tagCategories, function(c){
+            $scope.editTag.categories = $scope.editTag.categories || [];
             if($scope.editTag.categories.indexOf(c.value) !== -1 ){
               $scope.editCategories.options.push(c);
             }
@@ -43,7 +45,7 @@ module.controller('EditTagCtrl', ['$rootScope','$scope', 'TagService', '$state',
       angular.forEach($scope.editCategories.options, function(c){
         $scope.editTag.categories.push(c.value);
       });
-      $tagService.updateTag($scope.editTag).then(function(){
+      $tagService.updateTagSync($scope.editTag).then(function(){
           $state.go('index.tags.list');
         },
         function(error) {
diff --git a/src/app/tags/tags.edit.html b/src/app/tags/tags.edit.html
@@ -39,7 +39,7 @@ <h2><strong>Details</strong></h2>
             <div class="row">
                 <div class="form-group col-md-2" ng-class="{'has-error': editForm.selectedTagStatus.$touched && editForm.selectedTagStatus.$invalid}">
                     <label for="tag-status">Status</label>
-                    <select id="tag-status" class="form-control m-b" ng-options="tagStatus.value as tagStatus.name for tagStatus in tagStatuses" ng-model="editTag.status" name="selectedTagStatus">
+                    <select id="tag-status" class="form-control m-b" ng-options="tagStatus.value as tagStatus.name for tagStatus in getTagStatuses(editTag.domain)" ng-model="editTag.status" name="selectedTagStatus" required>
                     </select>
                     <div class="help-block" ng-messages="editForm.selectedTagStatus.$error" ng-show="editForm.selectedTagStatus.$touched">
                         <div ng-messages-include="errorMessages.html"></div>
diff --git a/src/app/tags/tags.list.controller.js b/src/app/tags/tags.list.controller.js
@@ -2,9 +2,9 @@
 
 var module = angular.module('supportAdminApp');
 
-module.controller('TagListCtrl', ['$scope', '$rootScope', '$timeout', '$state', '$uibModal',
+module.controller('TagListCtrl', ['$scope', '$rootScope', '$timeout', '$interval', '$state', '$uibModal',
   'AuthService', 'TagService',
-  function ($scope, $rootScope, $timeout, $state, $modal, $authService, $tagService) {
+  function ($scope, $rootScope, $timeout, $interval, $state, $modal, $authService, $tagService) {
     /**
      * Check if user is logged in
      */
@@ -46,6 +46,9 @@ module.controller('TagListCtrl', ['$scope', '$rootScope', '$timeout', '$state',
     $scope.isLoading = false;
     // find tags by name
     $scope.findTag = function () {
+      if ($scope.isSyncing) {
+        return;
+      }
       $scope.isLoading = true;
       $tagService.findTags($scope.tagName).then(
         function (tags) {
@@ -68,11 +71,11 @@ module.controller('TagListCtrl', ['$scope', '$rootScope', '$timeout', '$state',
       $state.go("index.tags.edit", {tagId: id});
     };
     //delete tag by id
-    $scope.deleteTag = function (id) {
+    $scope.deleteTag = function (tag) {
       if (!confirm('Are you sure want to delete this tag?')) {
         return;
       }
-      $tagService.deleteTag(id).then(
+      $tagService.deleteTagSync(tag).then(
         function () {
           $scope.findTag();
         },
@@ -83,6 +86,38 @@ module.controller('TagListCtrl', ['$scope', '$rootScope', '$timeout', '$state',
           });
         });
     };
-    $scope.findTag();
+
+    var SYNC_INTERVAL = 2 * 60 * 1000;
+    $scope.isSyncing = false;
+    $scope.syncTags = function () {
+      if ($scope.isSyncing) {
+        return;
+      }
+      $scope.isLoading = true;
+      $scope.isSyncing = true;
+      $tagService.syncTags($scope).then(
+        function (tags) {
+          $scope.isSyncing = false;
+          if (!$scope.tagName) {
+            $scope.tags = tags;
+            $timeout(function () {
+              $scope.isLoading = false;
+              $('.footable').trigger('footable_redraw');
+            }, 300);
+          } else {
+            $scope.findTag();
+          }
+        },
+        function (error) {
+          $scope.isLoading = false;
+          $scope.isSyncing = false;
+          $scope.$broadcast('alert.AlertIssued', {
+            type: 'danger',
+            message: error.error
+          });
+        });
+    };
+    $scope.syncTags();
+    $interval($scope.syncTags, SYNC_INTERVAL);
   }
 ]);
diff --git a/src/app/tags/tags.list.html b/src/app/tags/tags.list.html
@@ -78,7 +78,7 @@
                                         <td>
                                            <div class="row">
                                                 <div class="col-md-3">
-                                                    <a  href="javascript:;" data-ng-click='deleteTag(tag.id)' class="btn btn-sm btn-danger">
+                                                    <a  href="javascript:;" data-ng-click='deleteTag(tag)' class="btn btn-sm btn-danger">
                                                     <strong>Delete Tag</strong>
                                                 </a></div>
                                                 <div class="col-md-4 col-md-offset-4">
@@ -88,7 +88,7 @@
                                                 </div>
                                             </div>
                                         </td>
-                                        <td>{{showLabel(tag.status,tagStatuses)}}</td>
+                                        <td>{{showLabel(tag.status,getTagStatuses(tag.domain))}}</td>
                                       </tr>
                                     </tbody>
                                     <tfoot>
diff --git a/src/app/tags/tags.new.controller.js b/src/app/tags/tags.new.controller.js
@@ -21,7 +21,7 @@ module.controller('NewTagCtrl', ['$rootScope','$scope', 'TagService', '$state',
         $scope.newTag.categories.push(c.value);
       });
 
-      $tagService.createTag($scope.newTag).then(function(){
+      $tagService.createTagSync($scope.newTag).then(function(){
           $state.go('index.tags.list');
         },
         function(error) {
diff --git a/src/app/tags/tags.new.html b/src/app/tags/tags.new.html
@@ -30,7 +30,7 @@ <h2>Details</h2>
             <div class="row">
                 <div class="form-group col-md-2" ng-class="{'has-error': addForm.selectedTagStatus.$touched && addForm.selectedTagStatus.$invalid}">
                     <label for="tag-status">Status</label>
-                    <select id="tag-status" class="form-control m-b" ng-options="tagStatus.value as tagStatus.name for tagStatus in tagStatuses" ng-model="newTag.status" name="selectedTagStatus">
+                    <select id="tag-status" class="form-control m-b" ng-options="tagStatus.value as tagStatus.name for tagStatus in getTagStatuses(newTag.domain)" ng-model="newTag.status" name="selectedTagStatus" required>
                     </select>
                     <div class="help-block" ng-messages="addForm.selectedTagStatus.$error" ng-show="addForm.selectedTagStatus.$touched">
                         <div ng-messages-include="errorMessages.html"></div>
diff --git a/src/app/tags/tags.service.js b/src/app/tags/tags.service.js
