From 9ee65a7f022036e4dcf9dcca15519660e78d329e Mon Sep 17 00:00:00 2001 From: Youssef ABIDI Date: Tue, 22 Aug 2017 06:48:41 +0100 Subject: [PATCH] linking to the backend (members, lists) --- src/.DS_Store | Bin 6148 -> 6148 bytes src/app/pages/surveys/create/createTabCtrl.js | 4 +- src/app/pages/teams/lists/ListsTabCtrl.js | 44 +++++++++++---- src/app/pages/teams/lists/list.service.js | 51 ++++++++++++++++++ src/app/pages/teams/lists/lists.module.js | 3 +- src/app/pages/teams/lists/listsDirective.html | 2 +- .../teams/members/composeBox/compose.html | 11 ++-- .../members/composeBox/composeBoxCtrl.js | 7 ++- .../teams/members/detail/MemberDetailCtrl.js | 39 ++++++++++++-- .../members/membersListing/MembersListCtrl.js | 25 +++++++-- src/app/pages/teams/team.service.js | 51 ++++++++++++++++++ src/assets/.DS_Store | Bin 0 -> 6148 bytes src/assets/img/.DS_Store | Bin 0 -> 6148 bytes src/assets/img/app/.DS_Store | Bin 0 -> 6148 bytes src/assets/img/app/profile/undefined.png | Bin 0 -> 10433 bytes 15 files changed, 207 insertions(+), 30 deletions(-) create mode 100644 src/app/pages/teams/lists/list.service.js create mode 100644 src/app/pages/teams/team.service.js create mode 100644 src/assets/.DS_Store create mode 100644 src/assets/img/.DS_Store create mode 100644 src/assets/img/app/.DS_Store create mode 100644 src/assets/img/app/profile/undefined.png diff --git a/src/.DS_Store b/src/.DS_Store index fadd49af93a07740151b4698fdea46e28fdbf625..eccca27b83b6305482f212c76313a50306844f0e 100644 GIT binary patch delta 148 zcmZoMXfc=|&e%3FQH+&?fq{WzVxou)6OaJ{AexbZL4YASCn-Na2PDKcF;PPoB+kr` z$WXvgkW!2!2NWs>!c>M5hGLim&p3E?pFI82~SY9N+)| delta 101 zcmZoMXfc=|&Zs)EP*|6dfq{XUA(5egp&+F=IVUMUKL;cP224;IBml$$3>!Cwu}{1Z nxtX0qfP+zW")($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 @@