Merge branch 'dev'

* dev: (31 commits)
  Centre aligned the Preparing and Finishing texts.
  AS#99253782379764, Admin Tool - add progress bar and disable upload button when submission is processing
  Added support for bulk load users
  removing commented out code
  removing debugging statements
  -- Fixed undefined userHandle being used while uploading -- Fixed error in submission processor because of empty file.
  more fixes
  Changed an error message
  Checking profile after handle is updated [COR-534]
  COR-207
  COR-207
  COR-207
  COR-207
  COR-207
  COR-207
  Changed the label of user status in the Update status dialog. "Active" -> "Verified"
  Changed the albel for users' active status. Active -> Verified
  [COR-523] Admin Tool does not make user's email active - Changed labels (Email, Active) - Added "Email Status" in detailed items - Fixed a bug that contents in the table is not refreshed after activation/deactivation
  Show deactivation comment in Admin tool [COR-502] - A dialog to confirm change status history.
  Copy activation link feature in Admin tool [COR-503] - fixed an agly source
  ...

Author: vikasrohit

bower.json

@@ -25,9 +25,28 @@
     "angular-footable": "~1.0.3",
     "appirio-tech-ng-auth": "3.x.x",
     "appirio-tech-ng-login-reg": "0.x.x",
-    "appirio-tech-ng-api-services": "0.x.x"
+    "appirio-tech-ng-api-services": "0.x.x",
+    "angular-clipboard": "~1.2.1",
+    "appirio-tech-ng-login-reg": "0.x.x",
+    "lodash": "~4.2.0",
+    "angular-moment": "~1.0.0-beta.3",
+    "moment": "~2.11.2",
+    "moment-timezone": "~0.5.0",
+    "ng-file-model": "*"
   },
   "overrides": {
+    "bootstrap": {
+      "main": [
+        "less/bootstrap.less",
+        "dist/css/bootstrap.css",
+        "dist/js/bootstrap.js",
+        "dist/fonts/glyphicons-halflings-regular.eot",
+        "dist/fonts/glyphicons-halflings-regular.svg",
+        "dist/fonts/glyphicons-halflings-regular.ttf",
+        "dist/fonts/glyphicons-halflings-regular.woff",
+        "dist/fonts/glyphicons-halflings-regular.woff2"
+      ]
+    },
     "footable": {
       "main": [
         "dist/footable.all.min.js",
@@ -45,6 +64,7 @@
   "resolutions": {
     "jquery": "~2.1.1",
     "angular": "1.4.x",
-    "angular-resource": "1.4.x"
+    "angular-resource": "1.4.x",
+    "moment": "^2.10.x"
   }
 }

config.json

@@ -1,27 +1,31 @@
 {
   "local": {
     "API_URL" : "http://localhost:8080",
+    "API_VERSION_PATH" : "v3",
     "AUTH0_CLIENT_ID" : "JFDo7HMkf0q2CkVFHojy3zHWafziprhT",
     "AUTH0_DOMAIN" : "topcoder-dev.auth0.com",
     "AUTH0_TOKEN_NAME" : "userJWTToken",
     "AUTH0_REFRESH_TOKEN_NAME" : "userRefreshJWTToken"
   },
   "dev": {
     "API_URL" : "https://api.topcoder-dev.com",
+    "API_VERSION_PATH" : "v3",
     "AUTH0_CLIENT_ID" : "JFDo7HMkf0q2CkVFHojy3zHWafziprhT",
     "AUTH0_DOMAIN" : "topcoder-dev.auth0.com",
     "AUTH0_TOKEN_NAME" : "userJWTToken",
     "AUTH0_REFRESH_TOKEN_NAME" : "userRefreshJWTToken"
   },
   "qa": {
     "API_URL" : "https://api.topcoder-qa.com",
+    "API_VERSION_PATH" : "v3",
     "AUTH0_CLIENT_ID" : "EVOgWZlCtIFlbehkq02treuRRoJk12UR",
     "AUTH0_DOMAIN" : "topcoder-qa.auth0.com",
     "AUTH0_TOKEN_NAME" : "userJWTToken",
     "AUTH0_REFRESH_TOKEN_NAME" : "userRefreshJWTToken"
   },
   "prod": {
     "API_URL" : "https://api.topcoder.com",
+    "API_VERSION_PATH" : "v3",
     "AUTH0_CLIENT_ID" : "6ZwZEUo2ZK4c50aLPpgupeg5v2Ffxp9P",
     "AUTH0_DOMAIN" : "topcoder.auth0.com",
     "AUTH0_TOKEN_NAME" : "userJWTToken",

gulp/build.js

@@ -72,7 +72,8 @@ gulp.task('fonts', function () {
   return gulp.src($.mainBowerFiles())
     .pipe($.filter('**/*.{eot,svg,ttf,woff}'))
     .pipe($.flatten())
-    .pipe(gulp.dest(paths.dist + '/fonts/'));
+    .pipe(gulp.dest(paths.dist + '/fonts/'))
+    .pipe(gulp.dest(paths.dist + '/styles/fonts/'));
 });
 
 gulp.task('fontawesome', function () {

gulp/ng-config.js

@@ -8,7 +8,7 @@ gulp.task('ng-config', function () {
   gulp.src('config.json')
   .pipe(
     gulpNgConfig('app.constants', {
-      environment: process.env.BUILD_ENV || 'dev'
+      environment: process.env.BUILD_ENV || 'dev',
   }))
   .pipe(gulp.dest('src/app'))
 });

src/app/addmembers/add.controller.js

@@ -0,0 +1,33 @@
+'use strict';
+
+var module = angular.module('supportAdminApp');
+
+module.controller('addmembers.AddMemberController', ['$log', '$scope', '$parse', 'AuthService', 'MemberService', function ($log, $scope, $parse, $authService, $memberService) {
+
+    $scope.errors = [];
+    $scope.response = [];
+    $scope.save = function() {
+        $log.debug($scope.jsonInput);
+    };
+
+    $scope.add = function() {
+    	$log.debug($scope.jsonInput);
+
+    	if($scope.activate) {
+    	    $scope.activate = true;
+    	} else {
+    	    $scope.activate = false;
+    	}
+
+    	for ( var i=0, len = $scope.jsonInput.length; i<len; i++) {
+		    $memberService.addMember($scope.jsonInput[i], $scope.activate, $scope.showFullResponse).then(
+                   function(response) {
+                        $scope.response.push(response);
+                   },
+                   function(error) {
+                        $scope.errors.push(error);
+                   }
+            );
+        }
+    };
+}]);

src/app/addmembers/add.html

@@ -0,0 +1,59 @@
+
+<div class="row wrapper border-bottom white-bg page-heading">
+  <div class="col-lg-10">
+    <h2>Add Members</h2>
+  </div>
+  <div class="col-lg-2">
+  </div>
+</div>
+
+<div class="wrapper wrapper-content animated fadeInRight">
+  <div class="row" ng-controller="addmembers.AddMemberController">
+      <div class="col-lg-12">
+          <div class="ibox float-e-margins">
+              <div class="ibox-title">
+                  <div class="row">
+                      <form role="form">
+                        <form action="" method="post" enctype="multipart/form-data">
+                            <div class="form-group" ng-hide="jsonInput">
+                                <label class="control-label">Upload CSV file</label>
+                                <input type="file" csv-reader results="jsonInput" />
+                            </div>
+
+                            <div class="block right" ng-if="jsonInput.length">
+                                <h2>JSON</h2>
+                                <div class="content">{{ jsonInput }}</div>
+                                <div class="form-group">
+                                    <button class="btn btn-primary" ng-click="add()" type="button">Add</button>
+                                </div>
+                            </div>
+
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" ng-model="activate">Activate
+                                </label>
+                            </div>
+
+                            <div class="checkbox">
+                                <label>
+                                <input type="checkbox" ng-model="showFullResponse">Show Full Response
+                                </label>
+                            </div>
+
+                            <div ng-if="response.length">
+                                <h2>SUCCESS</h2>
+                                <div class="row" style="color:green; line-height:2;"><p style="margin-bottom:5px; border:1px solid black;" ng-repeat="res in response">{{ res }}</p></div>
+                                </div>
+
+                            <div ng-if="errors.length">
+                                <h2>ERRORS</h2>
+                                <div class="row" style="color:red; line-height:2;"><p style="margin-bottom:5px; border:1px solid black;" ng-repeat="error in errors">{{ error }}</p></div>
+                            </div>
+                        </form>
+                      </form>
+                  </div>
+              </div>
+          </div>
+      </div>
+  </div>
+</div>

src/app/addmembers/add.service.js

@@ -0,0 +1,71 @@
+'use strict';
+
+angular.module('supportAdminApp')
+  .factory('MemberService', ['$log', '$q','$http', 'API_URL',
+    function ($log, $q, $http, API_URL) {
+    // local dev
+    // var API_URL = 'http://local.topcoder-dev.com:8080';
+      return ({
+        /* add member */
+        addMember: function(jsonInput, activate, showFullResponse) {
+
+                  $log.debug("in addMember");
+                  $log.debug(jsonInput);
+                    var payload = "{\"param\": {" +
+                                            "\"handle\": \""+jsonInput.handle+"\","+
+                                            "\"firstName\": \""+jsonInput.firstName+"\","+
+                                            "\"lastName\": \""+jsonInput.lastName+"\","+
+                                            "\"email\": \""+jsonInput.email+"\","+
+                                            "\"active\": "+activate+","+
+                                            "\"country\": {"+
+                                            "\"name\": \""+jsonInput.country+"\"},"+
+                                            "\"credential\": {"+
+                                            "\"password\": \""+jsonInput.password+"\"}}}";
+                    $log.debug("payload is "+payload);
+                    var request = $http({
+                        method: 'POST',
+                        url: API_URL + '/v3/users',
+                        headers: {
+                            "Content-Type":"application/json"
+                        },
+                        data: payload
+                    });
+                    var errors;
+                    var response;
+                    return request.then(
+                        function(response) {
+                            $log.debug(response);
+                            if (!showFullResponse) {
+                                response = "HANDLE: "+jsonInput.handle+" STATUS: "+response.status;
+                            }
+                            return response;
+                        },
+                        function(error) {
+                            $log.error(error);
+                            var err;
+                            if(error && error.data && error.data.result) {
+                                err = {
+                                    status: error.status,
+                                    error : error.data.result.content
+                                };
+                                $log.error("Status: "+error.status);
+                                $log.error("Error Reason:  "+error.data.result.content);
+                                if (!showFullResponse) {
+                                    errors = "HANDLE: "+jsonInput.handle+" STATUS: "+error.status+" REASON: "+error.data.result.content;
+                                }else {
+                                    errors = error;
+                                }
+                            }
+                            if(!err) {
+                                err = {
+                                    status: error.status,
+                                    error : error.statusText
+                                };
+                            }
+                            return $q.reject(errors);
+                        }
+                    );
+
+                }, // addMember()
+      });
+    }]);

src/app/addmembers/csv.import.js

@@ -0,0 +1,94 @@
+'use strict';
+
+var csvImport = angular.module('csvReader', []);
+
+csvImport.directive('csvReader', [function () {
+
+    // Function to convert to JSON
+    var convertToJSON = function (content) {
+
+        // Declare our variables
+        var lines = content.csv.split('\n'),
+            headers = lines[0].split(content.separator),
+            columnCount = lines[0].split(content.separator).length,
+            results = [];
+
+        // For each row
+        for (var i = 1; i < lines.length; i++) {
+
+            // Declare an object
+            var obj = {};
+
+            // Get our current line
+            var line = lines[i].split(new RegExp(content.separator + '(?![^"]*"(?:(?:[^"]*"){2})*[^"]*$)'));
+
+            // For each header
+            for (var j = 0; j < headers.length; j++) {
+
+                // Populate our object
+                obj[headers[j]] = line[j];
+            }
+
+            // Push our object to our result array
+            results.push(obj);
+        }
+
+        // Return our array
+        return results;
+    };
+
+    return {
+        restrict: 'A',
+        scope: {
+            results: '=',
+            separator: '=',
+            callback: '&saveResultsCallback'
+        },
+        link: function (scope, element, attrs) {
+
+            // Create our data model
+            var data = {
+                csv: null,
+                separator: scope.separator || ','
+            };
+
+            // When the file input changes
+            element.on('change', function (e) {
+
+                // Get our files
+                var files = e.target.files;
+
+                // If we have some files
+                if (files && files.length) {
+
+                    // Create our fileReader and get our file
+                    var reader = new FileReader();
+                    var file = (e.srcElement || e.target).files[0];
+
+                    // Once the fileReader has loaded
+                    reader.onload = function (e) {
+
+                        // Get the contents of the reader
+                        var contents = e.target.result;
+
+                        // Set our contents to our data model
+                        data.csv = contents;
+
+                        // Apply to the scope
+                        scope.$apply(function () {
+
+                            // Our data after it has been converted to JSON
+                            scope.results = convertToJSON(data);
+
+                            // Call our callback function
+                            scope.callback(scope.result);
+                        });
+                    };
+
+                    // Read our file contents
+                    reader.readAsText(file);
+                }
+            });
+        }
+    };
+}])

src/app/addmembers/testData.txt

@@ -0,0 +1,2 @@
+handle,firstName,lastName,email,country,password
+rpemm_testbk1,ram,p,[email protected],United States,appirio123