diff --git a/src/.DS_Store b/src/.DS_Store index fadd49a..eccca27 100644 Binary files a/src/.DS_Store and b/src/.DS_Store differ diff --git a/src/app/pages/surveys/create/createTabCtrl.js b/src/app/pages/surveys/create/createTabCtrl.js index 9227b0d..24d31e9 100644 --- a/src/app/pages/surveys/create/createTabCtrl.js +++ b/src/app/pages/surveys/create/createTabCtrl.js @@ -7,7 +7,7 @@ angular.module('BlurAdmin.pages.surveys.create') .controller('CreateTabCtrl', CreateTabCtrl) - .directive('multiple', function() { + .directive('multipleQ', function() { return { templateUrl: 'app/pages/surveys/create/widgets/multiple.html' }; @@ -126,7 +126,7 @@ }; $scope.updateBuilder=function(){ - var compiledeHTML = $compile("
")($scope); + var compiledeHTML = $compile("
")($scope); $("#newElem").html(compiledeHTML); console.log($scope.survey.elements); diff --git a/src/app/pages/teams/lists/ListsTabCtrl.js b/src/app/pages/teams/lists/ListsTabCtrl.js index b3d149f..0e77f1c 100644 --- a/src/app/pages/teams/lists/ListsTabCtrl.js +++ b/src/app/pages/teams/lists/ListsTabCtrl.js @@ -9,7 +9,30 @@ .controller('ListsTabCtrl', ListsTabCtrl); /** @ngInject */ - function ListsTabCtrl($scope, baConfig, membersList) { + function ListsTabCtrl($scope, baConfig, membersList, ListService, $log) { + + + function loadLists() { + ListService + .list() + .then(function (data){ + $scope.Lists = data; + $log.info("Got the survey data",data); + }, function (error){ + $log.error(error); + }); + } + + function activate(){ + $scope.Lists = []; + + loadLists(); + } + + activate(); + + + $scope.transparent = baConfig.theme.blur; var dashboardColors = baConfig.colors.dashboard; @@ -18,18 +41,13 @@ colors.push(dashboardColors[key]); } + + function getRandomColor() { var i = Math.floor(Math.random() * (colors.length - 1)); return colors[i]; } - $scope.Lists = [ - { name: 'Check me out yeah', deleted : false, members : ['4563faass', '4563fdfvd'] }, - { name: 'Lorem ipsum', deleted : false, members : ['4563zxcss', '8955sddf'] }, - { name: 'Ex has semper', deleted : false, members : ['8955sdfcc', '8955sddf'] }, - { name: 'Vim an eius', deleted : false, members : ['8955sddf', '4563faass'] }, - ]; - $scope.tabs = membersList.getTabs(); $scope.searchResult = membersList.getAllMessages(); @@ -40,20 +58,24 @@ item.color = getRandomColor(); }); - $scope.newTodoText = ''; + $scope.newTodoText = 'tech'; $scope.listMembers = []; $scope.selectedLabel = "listing"; $scope.addNewList = function (event, clickPlus) { if (clickPlus || event.which === 13) { - $scope.Lists.unshift({ + /*$scope.Lists.unshift({ name: $scope.newTodoText, color: getRandomColor(), - }); + });*/ + var list = {"name" : $scope.newTodoText}; + ListService.create(list); + loadLists(); $scope.newTodoText = ''; } }; + $scope.updateMembers = function (index) { //uncheck others lists for(var i = 0; i<$scope.Lists.length; i++) diff --git a/src/app/pages/teams/lists/list.service.js b/src/app/pages/teams/lists/list.service.js new file mode 100644 index 0000000..7f64005 --- /dev/null +++ b/src/app/pages/teams/lists/list.service.js @@ -0,0 +1,51 @@ +/** + * @author ayoub + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.teams.lists') + .factory('ListService', ListService); + + /** @ngInject */ + function ListService($http, $q) { + var apiBaseUrl = "http://localhost:9000" + var endpoint = apiBaseUrl + "/lists"; + + function list(params) { + params = params || {}; + + var deferred = $q.defer(); + $http.get(endpoint) + .success(function(data) { + deferred.resolve(data); + }).error(function(msg, code) { + deferred.reject(msg); + }); + + return deferred.promise; + + + return $http.get(endpoint, params); + } + + function create(list) { + return $http.post(endpoint, list); + } + + function edit(list) { + console.log("edit Member Object", list); + } + + function remove(list) { + console.log("remove Member", list); + } + + return { + list:list, + create:create, + edit:edit, + remove:remove + } + } +})(); diff --git a/src/app/pages/teams/lists/lists.module.js b/src/app/pages/teams/lists/lists.module.js index 0534047..f4c8fd8 100644 --- a/src/app/pages/teams/lists/lists.module.js +++ b/src/app/pages/teams/lists/lists.module.js @@ -15,8 +15,7 @@ url: '/lists', //abstract: true, templateUrl: 'app/pages/teams/lists/lists.html', - controller: "ListsTabCtrl", - controllerAs: "listsTabCtrl", + controller: "ListsTabCtrl as vm", title: 'Lists', sidebarMeta: { order: 0, diff --git a/src/app/pages/teams/lists/listsDirective.html b/src/app/pages/teams/lists/listsDirective.html index 58f750a..6c4e22e 100644 --- a/src/app/pages/teams/lists/listsDirective.html +++ b/src/app/pages/teams/lists/listsDirective.html @@ -54,7 +54,7 @@ ba-panel ba-panel-title="Add new members" ba-panel-class="xmedium-panel feed-comply-panel with-scroll todo-panel"> - + +
@@ -44,11 +44,8 @@
- +
@@ -72,7 +69,7 @@
- +
diff --git a/src/app/pages/teams/members/composeBox/composeBoxCtrl.js b/src/app/pages/teams/members/composeBox/composeBoxCtrl.js index 073502c..468ad05 100644 --- a/src/app/pages/teams/members/composeBox/composeBoxCtrl.js +++ b/src/app/pages/teams/members/composeBox/composeBoxCtrl.js @@ -9,11 +9,12 @@ .controller('composeBoxCtrl', composeBoxCtrl); /** @ngInject */ - function composeBoxCtrl(member, membersList,fileReader, $filter) { + function composeBoxCtrl(member, membersList,MemberService,fileReader, $filter) { var vm = this; vm.member = member; //vm.actualIndex = actualIndex; vm.picture = (member.pic && member.pic != "") ? $filter('profilePicture')(member.name.split(' ')[0]) : $filter('appImage')('theme/no-photo.png'); + vm.Labels = membersList.getTabs(); vm.removePicture = function () { vm.picture = $filter('appImage')('theme/no-photo.png'); @@ -36,5 +37,9 @@ vm.updateMember = function () { console.log(membersList.getIndexById(vm.member.id), vm.member); }; + + vm.createMember = function () { + MemberService.create(vm.member); + }; } })(); \ No newline at end of file diff --git a/src/app/pages/teams/members/detail/MemberDetailCtrl.js b/src/app/pages/teams/members/detail/MemberDetailCtrl.js index 7416201..be55af5 100644 --- a/src/app/pages/teams/members/detail/MemberDetailCtrl.js +++ b/src/app/pages/teams/members/detail/MemberDetailCtrl.js @@ -9,10 +9,43 @@ .controller('MemberDetailCtrl', MemberDetailCtrl); /** @ngInject */ - function MemberDetailCtrl($stateParams, membersList) { + function MemberDetailCtrl($stateParams, membersList, MemberService, $log) { var vm = this; - vm.member = membersList.getMemberById($stateParams.id); - vm.label = $stateParams.label; + //vm.member = membersList.getMemberById($stateParams.id); + //vm.label = $stateParams.label; + + //var vm = this; + //vm.members = ($stateParams.label == "listing") ? membersList.getAllMessages() : membersList.getMembersByLabel($stateParams.label); + + function loadMembers() { + MemberService + .list() + .then(function (data){ + vm.members = data; + $log.info("Got the members data",data); + vm.member = getMember(); + console.log(vm.member); + }, function (error){ + $log.error(error); + }); + } + + function getMember() { + $log.info("getMember",$stateParams.id); + return vm.members.filter(function(m){ + return m.id == $stateParams.id; + })[0]; + } + + function activate(){ + vm.members = []; + vm.member = []; + loadMembers(); + + + } + + activate(); } })(); diff --git a/src/app/pages/teams/members/membersListing/MembersListCtrl.js b/src/app/pages/teams/members/membersListing/MembersListCtrl.js index 75cd85d..b8c78d2 100644 --- a/src/app/pages/teams/members/membersListing/MembersListCtrl.js +++ b/src/app/pages/teams/members/membersListing/MembersListCtrl.js @@ -9,10 +9,29 @@ .controller('MembersListCtrl', MembersListCtrl); /** @ngInject */ - function MembersListCtrl($scope, $stateParams, membersList) { + function MembersListCtrl($scope, $stateParams,MemberService, $log, membersList) { var vm = this; - vm.members = ($stateParams.label == "listing") ? membersList.getAllMessages() : membersList.getMembersByLabel($stateParams.label); - vm.label = $stateParams.label; + //vm.members = ($stateParams.label == "listing") ? membersList.getAllMessages() : membersList.getMembersByLabel($stateParams.label); + + function loadMembers() { + MemberService + .list() + .then(function (data){ + vm.members = data; + $log.info("Got the members data",data); + }, function (error){ + $log.error(error); + }); + } + + function activate(){ + vm.members = []; + loadMembers(); + + + } + + activate(); } diff --git a/src/app/pages/teams/team.service.js b/src/app/pages/teams/team.service.js new file mode 100644 index 0000000..20e7f45 --- /dev/null +++ b/src/app/pages/teams/team.service.js @@ -0,0 +1,51 @@ +/** + * @author ayoub + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.teams') + .factory('MemberService', MemberService); + + /** @ngInject */ + function MemberService($http, $q) { + var apiBaseUrl = "http://localhost:9000" + var endpoint = apiBaseUrl + "/members"; + + function list(params) { + params = params || {}; + + var deferred = $q.defer(); + $http.get(endpoint) + .success(function(data) { + deferred.resolve(data); + }).error(function(msg, code) { + deferred.reject(msg); + }); + + return deferred.promise; + + + return $http.get(endpoint, params); + } + + function create(member) { + return $http.post(endpoint, member); + } + + function edit(member) { + console.log("edit Member Object", member); + } + + function remove(member) { + console.log("remove Member", member); + } + + return { + list:list, + create:create, + edit:edit, + remove:remove + } + } +})(); diff --git a/src/assets/.DS_Store b/src/assets/.DS_Store new file mode 100644 index 0000000..f10092a Binary files /dev/null and b/src/assets/.DS_Store differ diff --git a/src/assets/img/.DS_Store b/src/assets/img/.DS_Store new file mode 100644 index 0000000..7cf6075 Binary files /dev/null and b/src/assets/img/.DS_Store differ diff --git a/src/assets/img/app/.DS_Store b/src/assets/img/app/.DS_Store new file mode 100644 index 0000000..beea48a Binary files /dev/null and b/src/assets/img/app/.DS_Store differ diff --git a/src/assets/img/app/profile/undefined.png b/src/assets/img/app/profile/undefined.png new file mode 100644 index 0000000..c023f84 Binary files /dev/null and b/src/assets/img/app/profile/undefined.png differ